i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "BMenu: fix memory leak in scripting"

Browse Source 
This reverts commit fb44a1cd72.

Reason for revert: may cause UAFs

Change-Id: I315ce4fc5cd1706ca07e7062fc0461b7fff7c831
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2980
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
waddlesplash
2020-07-03 03:02:12 +00:00
parent 1eabd14811
commit 66f0993a1b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+2 -6
View File
@@ -1670,10 +1670,8 @@ void BMenu::_ScriptReceived(BMessage* message)
if (err >= B_OK) { if (err >= B_OK) {
if (item->Submenu() == NULL) if (item->Submenu() == NULL)
err = B_BAD_VALUE; err = B_BAD_VALUE;
else { else
RemoveItem(item); RemoveItem(item);
delete item;
}
} }
} }
break; break;
@@ -1739,10 +1737,8 @@ void BMenu::_ScriptReceived(BMessage* message)
if (message->what == B_DELETE_PROPERTY) { if (message->what == B_DELETE_PROPERTY) {
BMenuItem *item = NULL; BMenuItem *item = NULL;
err = _ResolveItemSpecifier(specifier, what, item); err = _ResolveItemSpecifier(specifier, what, item);
if (err >= B_OK) { if (err >= B_OK)
RemoveItem(item); RemoveItem(item);
delete item;
}
} }
break; break;
case 12: { // MenuItem: EXECUTE case 12: { // MenuItem: EXECUTE