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

BMenu: Lock the looper before calling _AddItem().

Browse Source 
Otherwise, we could wind up in a state where the
list of items is being concurrently accessed,
which is invalid.

Hopefully fixes #18256.
This commit is contained in:
Augustin Cavalier
2023-08-24 19:14:19 -04:00
parent b89f11999a
commit 4e145eadc6
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+17 -4
View File
@@ -726,11 +726,19 @@ BMenu::AddItem(BMenuItem* item, int32 index)
"be called if the menu layout is not B_ITEMS_IN_MATRIX"); "be called if the menu layout is not B_ITEMS_IN_MATRIX");
} }
if (item == NULL || !_AddItem(item, index)) if (item == NULL)
return false; return false;
const bool locked = LockLooper();
if (!_AddItem(item, index)) {
if (locked)
UnlockLooper();
return false;
}
InvalidateLayout(); InvalidateLayout();
if (LockLooper()) { if (locked) {
if (!Window()->IsHidden()) { if (!Window()->IsHidden()) {
_LayoutItems(index); _LayoutItems(index);
_UpdateWindowViewSize(false); _UpdateWindowViewSize(false);
@@ -754,13 +762,18 @@ BMenu::AddItem(BMenuItem* item, BRect frame)
if (item == NULL) if (item == NULL)
return false; return false;
const bool locked = LockLooper();
item->fBounds = frame; item->fBounds = frame;
int32 index = CountItems(); int32 index = CountItems();
if (!_AddItem(item, index)) if (!_AddItem(item, index)) {
if (locked)
UnlockLooper();
return false; return false;
}
if (LockLooper()) { if (locked) {
if (!Window()->IsHidden()) { if (!Window()->IsHidden()) {
_LayoutItems(index); _LayoutItems(index);
Invalidate(); Invalidate();