Arkadiusz Hiler : user32: Fix NULL dereference in UnregisterDeviceNotification.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65e550d265c481ff80d796622258c7177b36d745
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=65e550d265c481ff80d796622...

Author: Arkadiusz Hiler <arek(a)hiler.eu>
Date:   Tue May 26 23:01:36 2020 +0300

user32: Fix NULL dereference in UnregisterDeviceNotification.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49211
Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/sechost/service.c    | 3 +++
 dlls/user32/tests/input.c | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c
index 924a6c9264..68d2b9e78e 100644
--- a/dlls/sechost/service.c
+++ b/dlls/sechost/service.c
@@ -2109,6 +2109,9 @@ BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle )
 
     TRACE("%p\n", handle);
 
+    if (!handle)
+        return FALSE;
+
     EnterCriticalSection( &service_cs );
     list_remove( ®istration->entry );
     LeaveCriticalSection(&service_cs);
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 92b18becd2..913fabfbd8 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -3004,6 +3004,12 @@ static void test_GetPointerType(void)
     ok(type == PT_MOUSE, " type %d\n", type );
 }
 
+static void test_UnregisterDeviceNotification(void)
+{
+    BOOL ret = UnregisterDeviceNotification(NULL);
+    ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret);
+}
+
 START_TEST(input)
 {
     POINT pos;
@@ -3050,4 +3056,6 @@ START_TEST(input)
         test_GetPointerType();
     else
         win_skip("GetPointerType is not available\n");
+
+    test_UnregisterDeviceNotification();
 }