Bug 460002, r+sr=sicking, a=dveditz

git-svn-id: svn://10.0.0.236/trunk@254683 18797224-902f-48f8-a5cc-f745e15eee43
2008-10-20 19:02:45 +00:00
parent eec25e0428
commit 7a04a7bdc5
1 changed files with 3 additions and 4 deletions
--- a/mozilla/content/base/src/nsXMLHttpRequest.cpp
+++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp
@@ -1006,10 +1006,6 @@ nsXMLHttpRequest::NotifyEventListeners(const nsCOMArray<nsIDOMEventListener>& aL
  nsCOMPtr<nsIJSContextStack> stack;
  JSContext *cx = nsnull;

-  if (NS_FAILED(CheckInnerWindowCorrectness())) {
-    return;
-  }
-
  if (mScriptContext) {
    stack = do_GetService("@mozilla.org/js/xpc/ContextStack;1");

@@ -1027,6 +1023,9 @@ nsXMLHttpRequest::NotifyEventListeners(const nsCOMArray<nsIDOMEventListener>& aL
    nsIDOMEventListener* listener = aListeners[index];
    
    if (listener) {
+      if (NS_FAILED(CheckInnerWindowCorrectness())) {
+        break;
+      }
      listener->HandleEvent(aEvent);
    }
  }