don't call delete if we're already in the destructor

fix brave/browser-laptop#4061 auditors: @bbondy
brave · Sep 16, 2016 · 1c09ed9 · 1c09ed9
1 parent 3564083
commit 1c09ed9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/atom/browser/api/atom_api_menu.cc b/atom/browser/api/atom_api_menu.cc
@@ -21,11 +21,13 @@ namespace api {
 
 Menu::Menu(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
     : model_(new AtomMenuModel(this)),
-      parent_(nullptr) {
+      parent_(nullptr),
+      is_destroyed_(false) {
   InitWith(isolate, wrapper);
 }
 
 Menu::~Menu() {
+  is_destroyed_ = true;
   MenuDestroyed();
 }
 
@@ -157,7 +159,9 @@ bool Menu::IsVisibleAt(int index) const {
 
 void Menu::MenuDestroyed() {
   FOR_EACH_OBSERVER(MenuObserver, observers_, MenuDestroyed());
-  base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
+  if (!is_destroyed_) {
+    base::MessageLoop::current()->PostTask(FROM_HERE, GetDestroyClosure());
+  }
 }
 
 // static

diff --git a/atom/browser/api/atom_api_menu.h b/atom/browser/api/atom_api_menu.h
@@ -111,6 +111,8 @@ class Menu : public mate::TrackableObject<Menu>,
 
   base::ObserverList<MenuObserver> observers_;
 
+  bool is_destroyed_;
+
   DISALLOW_COPY_AND_ASSIGN(Menu);
 };