hrev54384 adds 1 changeset to branch 'master'
old head: 1eabd14811a6d4f6223e859c1f0797070bc8398f
new head: 66f0993a1b418ee02d0236f45f58233d9b9814ed
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=66f0993a1b41+%5E1eabd14811a6
----------------------------------------------------------------------------
66f0993a1b41: 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 <waddlesplash@xxxxxxxxx>
[ waddlesplash <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54384
Commit: 66f0993a1b418ee02d0236f45f58233d9b9814ed
URL: https://git.haiku-os.org/haiku/commit/?id=66f0993a1b41
Author: waddlesplash <waddlesplash@xxxxxxxxx>
Date: Fri Jul 3 03:02:04 2020 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 6 deletions(-)
src/kits/interface/Menu.cpp | 8 ++------
----------------------------------------------------------------------------
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
