From 16beeefbbb3397ba229c8c089938f2e667733914 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 3 May 2016 12:38:41 +0000 Subject: [PATCH] [WIN32K:NTUSER] - In IntDesktopObjectDelete, correctly handle the case where pDeskInfo could not be allocated CORE-11124 svn path=/trunk/; revision=71239 --- reactos/win32ss/user/ntuser/desktop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/reactos/win32ss/user/ntuser/desktop.c b/reactos/win32ss/user/ntuser/desktop.c index 3d5ebc827e2..3343843181a 100644 --- a/reactos/win32ss/user/ntuser/desktop.c +++ b/reactos/win32ss/user/ntuser/desktop.c @@ -151,10 +151,12 @@ IntDesktopObjectDelete( 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);