From 66f0993a1b418ee02d0236f45f58233d9b9814ed Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Fri, 3 Jul 2020 03:02:04 +0000 Subject: [PATCH] Revert "BMenu: fix memory leak in scripting" This reverts commit fb44a1cd7204b88987cd1370cb1a5ccf30d479d5. Reason for revert: may cause UAFs Change-Id: I315ce4fc5cd1706ca07e7062fc0461b7fff7c831 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2980 Reviewed-by: waddlesplash --- src/kits/interface/Menu.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index f00920df4c..f280436e70 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -1670,10 +1670,8 @@ void BMenu::_ScriptReceived(BMessage* message) if (err >= B_OK) { if (item->Submenu() == NULL) err = B_BAD_VALUE; - else { + else RemoveItem(item); - delete item; - } } } break; @@ -1739,10 +1737,8 @@ void BMenu::_ScriptReceived(BMessage* message) if (message->what == B_DELETE_PROPERTY) { BMenuItem *item = NULL; err = _ResolveItemSpecifier(specifier, what, item); - if (err >= B_OK) { + if (err >= B_OK) RemoveItem(item); - delete item; - } } break; case 12: { // MenuItem: EXECUTE