Author: tfaber
Date: Tue May  3 12:38:41 2016
New Revision: 71239

URL: http://svn.reactos.org/svn/reactos?rev=71239&view=rev
Log:
[WIN32K:NTUSER]
- In IntDesktopObjectDelete, correctly handle the case where pDeskInfo could 
not be allocated
CORE-11124

Modified:
    trunk/reactos/win32ss/user/ntuser/desktop.c

Modified: trunk/reactos/win32ss/user/ntuser/desktop.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/desktop.c?rev=71239&r1=71238&r2=71239&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue May  3 
12:38:41 2016
@@ -151,10 +151,12 @@
 
     TRACE("Deleting desktop object 0x%p\n", pdesk);
 
-    ASSERT(pdesk->pDeskInfo->spwnd->spwndChild == NULL);
-
-    if (pdesk->pDeskInfo->spwnd)
+    if (pdesk->pDeskInfo &&
+        pdesk->pDeskInfo->spwnd)
+    {
+        ASSERT(pdesk->pDeskInfo->spwnd->spwndChild == NULL);
         co_UserDestroyWindow(pdesk->pDeskInfo->spwnd);
+    }
 
     if (pdesk->spwndMessage)
         co_UserDestroyWindow(pdesk->spwndMessage);


Reply via email to