server: Don't allow an empty desktop name.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Don't allow an empty desktop name.
aec5ccfc · Huw Davies · Alexandre Julliard · 42e50e44 · aec5ccfc · aec5ccfc
Commit aec5ccfc authored Jun 24, 2020 by Huw Davies Committed by Alexandre Julliard Jun 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

winstation.c dlls/user32/tests/winstation.c +0 -2

winstation.c server/winstation.c +5 -0

No files found.
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -296,9 +296,7 @@ static void test_handles(void)

    SetLastError( 0xdeadbeef );
    d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
-    todo_wine
    ok( !d2, "create empty desktop succeeded\n" );
-    todo_wine
    ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() );

    SetLastError( 0xdeadbeef );

--- a/server/winstation.c
+++ b/server/winstation.c
@@ -513,6 +513,11 @@ DECL_HANDLER(create_desktop)
    struct unicode_str name = get_req_unicode_str();

    reply->handle = 0;
+    if (!name.len)
+    {
+        set_error( STATUS_INVALID_HANDLE );
+        return;
+    }
    if ((winstation = get_process_winstation( current->process, WINSTA_CREATEDESKTOP )))
    {
        if ((desktop = create_desktop( &name, req->attributes, req->flags, winstation )))