Fix for issue #78. Query for subscribers without throwing.

googleprojectzero · May 19, 2024 · 280826a · 280826a
1 parent 67f78a8
commit 280826a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/NtApiDotNet/NtWnf.cs b/NtApiDotNet/NtWnf.cs
@@ -307,7 +307,7 @@ public static IEnumerable<NtWnf> GetRegisteredNotifications()
         /// <summary>
         /// Get if the state has subscribers.
         /// </summary>
-        public bool SubscribersPresent => Query<int>(StateName, WnfStateNameInformation.SubscribersPresent, true).Result != 0;
+        public bool SubscribersPresent => GetSubscribersPresent(true).Result;
 
         /// <summary>
         /// Get the security descriptor for this object, if known.
@@ -439,6 +439,15 @@ public void DeleteStateData()
             DeleteStateData(IntPtr.Zero);
         }
 
+        /// <summary>
+        /// Get if the state has subscribers.
+        /// </summary>
+        /// <param name="throw_on_error">True to throw on error.</param>
+        /// <returns>The status of subscribers.</returns>
+        public NtResult<bool> GetSubscribersPresent(bool throw_on_error)
+        {
+            return Query<int>(StateName, WnfStateNameInformation.SubscribersPresent, throw_on_error).Map(i => i != 0);
+        }
         #endregion
 
         /// <summary>

diff --git a/NtObjectManager/Cmdlets/Accessible/WnfAccessCheckResult.cs b/NtObjectManager/Cmdlets/Accessible/WnfAccessCheckResult.cs
@@ -46,7 +46,7 @@ internal WnfAccessCheckResult(NtWnf wnf,
         {
             StateName = wnf.StateName;
             Lifetime = wnf.Lifetime;
-            SubscribersPresent = wnf.SubscribersPresent;
+            SubscribersPresent = wnf.GetSubscribersPresent(false).GetResultOrDefault();
         }
     }
 }