Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 04:03:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K:NTUSER] Handle realloc failure in IntRemoveMenuItem. CORE-14222

Browse source
This commit is contained in:
Thomas Faber 2018-02-01 11:06:50 +01:00
parent c464f4f2e3
commit de455c4d50
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
win32ss/user/ntuser/menu.c
View file

@ -598,6 +598,7 @@ BOOL FASTCALL
IntRemoveMenuItem( PMENU pMenu, UINT nPos, UINT wFlags, BOOL bRecurse ) IntRemoveMenuItem( PMENU pMenu, UINT nPos, UINT wFlags, BOOL bRecurse )
{ {
PITEM item; PITEM item;
PITEM newItems;
TRACE("(menu=%p pos=%04x flags=%04x)\n",pMenu, nPos, wFlags); TRACE("(menu=%p pos=%04x flags=%04x)\n",pMenu, nPos, wFlags);
if (!(item = MENU_FindItem( &pMenu, &nPos, wFlags ))) return FALSE; if (!(item = MENU_FindItem( &pMenu, &nPos, wFlags ))) return FALSE;
@ -617,13 +618,17 @@ IntRemoveMenuItem( PMENU pMenu, UINT nPos, UINT wFlags, BOOL bRecurse )
} }
else else
{ {
while(nPos < pMenu->cItems) while (nPos < pMenu->cItems)
{ {
*item = *(item+1); *item = *(item+1);
item++; item++;
nPos++; nPos++;
} }
pMenu->rgItems = DesktopHeapReAlloc(pMenu->head.rpdesk, pMenu->rgItems, pMenu->cItems * sizeof(ITEM)); newItems = DesktopHeapReAlloc(pMenu->head.rpdesk, pMenu->rgItems, pMenu->cItems * sizeof(ITEM));
if (newItems)
{
pMenu->rgItems = newItems;
}
} }
return TRUE; return TRUE;
} }