win32u: Validate the info parameter in NtUserEnumDisplayDevices.

Signed-off-by: Torge Matthies <openglfreak@googlemail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

win32u: Validate the info parameter in NtUserEnumDisplayDevices.
286b99a4 · Torge Matthies · Alexandre Julliard · 28b77c9b · 286b99a4 · 286b99a4
Commit 286b99a4 authored Dec 10, 2021 by Torge Matthies Committed by Alexandre Julliard Dec 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 5 deletions

sysparams.c dlls/win32u/sysparams.c +2 -0

win32u.c dlls/win32u/tests/win32u.c +13 -5

No files found.
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -1571,6 +1571,8 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index,

    TRACE( "%s %u %p %#x\n", debugstr_us( device ), index, info, flags );

+    if (!info || !info->cb) return STATUS_UNSUCCESSFUL;
+
    if (!lock_display_devices()) return STATUS_UNSUCCESSFUL;

    if (!device || !device->Length)

--- a/dlls/win32u/tests/win32u.c
+++ b/dlls/win32u/tests/win32u.c
@@ -45,15 +45,23 @@ static void test_NtUserEnumDisplayDevices(void)

    SetLastError( 0xdeadbeef );
    ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 );
-    todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
-                  "NtUserEnumDisplayDevices returned %x %u\n", ret,
-                  GetLastError() );
+    ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
+        "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );

    SetLastError( 0xdeadbeef );
    ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 );
    ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
-                  "NtUserEnumDisplayDevices returned %x %u\n", ret,
-                  GetLastError() );
+        "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+
+    SetLastError( 0xdeadbeef );
+    ret = NtUserEnumDisplayDevices( NULL, 0, NULL, 0 );
+    ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
+        "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
+
+    SetLastError( 0xdeadbeef );
+    ret = NtUserEnumDisplayDevices( NULL, 12345, NULL, 0 );
+    ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef,
+        "NtUserEnumDisplayDevices returned %x %u\n", ret, GetLastError() );
 }

 static void test_NtUserCloseWindowStation(void)