user32: Handle HeapReAlloc failure in RemoveMenu.

The array size is being decreased so failure is not critical here, but it can still happen, e.g. when DPH is in use. Signed-off-by: Thomas Faber <thomas.faber@reactos.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Handle HeapReAlloc failure in RemoveMenu.
7ee4588c · Thomas Faber · Alexandre Julliard · d186f681 · 7ee4588c
Commit 7ee4588c authored Feb 03, 2018 by Thomas Faber Committed by Alexandre Julliard Feb 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

menu.c dlls/user32/menu.c +4 -2

No files found.
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3989,14 +3989,16 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags )
    }
    else
    {
+        MENUITEM *new_items;
 	while(nPos < menu->nItems)
 	{
 	    *item = *(item+1);
 	    item++;
 	    nPos++;
 	}
-        menu->items = HeapReAlloc( GetProcessHeap(), 0, menu->items,
-                                   menu->nItems * sizeof(MENUITEM) );
+        new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items,
+                                 menu->nItems * sizeof(MENUITEM) );
+        if (new_items) menu->items = new_items;
    }
    return TRUE;
 }