1.14.7

sandboxie-plus · Sep 2, 2024 · e0e4b88 · e0e4b88
1 parent c52d5f3
commit e0e4b88
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - fixed and improved HideDiskSerialNumber option causes applications to crash [#4185](https://github.com/sandboxie-plus/Sandboxie/issues/4185)
 - fixed encrypted proxy password was inproeprly formated [#4197](https://github.com/sandboxie-plus/Sandboxie/issues/4197)
-
+- fixed NtQueryDirectoryObject (you should not return "STATUS_MORE_ENTRIES") as this is a EASY Sandbox Detection [#4201](https://github.com/sandboxie-plus/Sandboxie/issues/4201)
 
 
 ## [1.14.6 / 5.69.6] - 2024-07-30

diff --git a/Sandboxie/core/dll/ipc.c b/Sandboxie/core/dll/ipc.c
@@ -4321,7 +4321,7 @@ _FX NTSTATUS Ipc_NtQueryDirectoryObject(
 
         ULONG len = sizeof(OBJECT_DIRECTORY_INFORMATION) + (cur->Name.MaximumLength + cur->TypeName.MaximumLength) * sizeof(WCHAR);
 
-        if (TotalLength + len > Length)
+        if (Buffer && TotalLength + len > Length)
             break; // not enough space for this entry
 
         CountToGo++;
@@ -4331,6 +4331,15 @@ _FX NTSTATUS Ipc_NtQueryDirectoryObject(
             break;
     }
 
+    //
+    // probe case
+    //
+
+    if (!Buffer) {
+        if (ReturnLength) *ReturnLength = TotalLength;
+        return STATUS_BUFFER_TOO_SMALL;
+    }
+
     //
     // fill output buffer
     //