Bug 1166932 - Part 1: Copy the editor observers array before iteratin…

…g over it; r=roc
mozilla · May 23, 2015 · 99f5d83 · 99f5d83
1 parent ff106a4
commit 99f5d83
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp
@@ -1807,10 +1807,12 @@ class EditorInputEventDispatcher : public nsRunnable
 void
 nsEditor::NotifyEditorObservers(NotificationForEditorObservers aNotification)
 {
+  // Copy the observers since EditAction()s can modify mEditorObservers.
+  nsTArray<mozilla::dom::OwningNonNull<nsIEditorObserver>> observers(mEditorObservers);
   switch (aNotification) {
     case eNotifyEditorObserversOfEnd:
       mIsInEditAction = false;
-      for (auto& observer : mEditorObservers) {
+      for (auto& observer : observers) {
         observer->EditAction();
       }
 
@@ -1822,13 +1824,13 @@ nsEditor::NotifyEditorObservers(NotificationForEditorObservers aNotification)
       break;
     case eNotifyEditorObserversOfBefore:
       mIsInEditAction = true;
-      for (auto& observer : mEditorObservers) {
+      for (auto& observer : observers) {
         observer->BeforeEditAction();
       }
       break;
     case eNotifyEditorObserversOfCancel:
       mIsInEditAction = false;
-      for (auto& observer : mEditorObservers) {
+      for (auto& observer : observers) {
         observer->CancelEditAction();
       }
       break;