aboutsummaryrefslogtreecommitdiff
path: root/www/firefox36/files/patch-ff-489131
blob: bb7f1f60698f234164203016a1307d5d67e23a93 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
diff -U12 -up mozilla/content/base/src/nsContentUtils.cpp.489131 mozilla/content/base/src/nsContentUtils.cpp
--- content/base/src/nsContentUtils.cpp.489131	2009-05-14 13:30:53.000000000 +0200
+++ content/base/src/nsContentUtils.cpp	2009-05-14 13:30:53.000000000 +0200
@@ -2310,24 +2310,25 @@ nsCxPusher::Push(nsISupports *aCurrentTa
   if (mScx) {
     NS_ERROR("Whaaa! No double pushing with nsCxPusher::Push()!");
 
     return PR_FALSE;
   }
 
   nsCOMPtr<nsIScriptGlobalObject> sgo;
   nsCOMPtr<nsIContent> content(do_QueryInterface(aCurrentTarget));
   nsCOMPtr<nsIDocument> document;
 
   if (content) {
     document = content->GetOwnerDoc();
+    NS_ENSURE_TRUE(document, PR_FALSE);
   }
 
   if (!document) {
     document = do_QueryInterface(aCurrentTarget);
   }
 
   if (document) {
     nsCOMPtr<nsIDocument_MOZILLA_1_8_BRANCH3> branch3doc =
       do_QueryInterface(document);
     NS_ASSERTION(branch3doc,
                  "Document must implement nsIDocument_MOZILLA_1_8_BRANCH3!!!");
     PRBool hasHadScriptObject = PR_TRUE;