Changeset 130657 in webkit

Timestamp:

Oct 8, 2012, 11:15:01 AM (14 years ago)

Author:

mkwst@chromium.org

Message:

Null-check for DOMWindow before feeding it to FeatureObserver.
​https://bugs.webkit.org/show_bug.cgi?id=98624

Reviewed by Adam Barth.

Source/WebCore:

We shouldn't call out to FeatureObserver in
ContentSecurityPolicy::didReceiveHeader if the policy's document doesn't
have a DOMWindow.

Test: http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash.html

• page/ContentSecurityPolicy.cpp:

(WebCore::ContentSecurityPolicy::didReceiveHeader):

Null check 'document->domWindow' before passing it on.

• page/FeatureObserver.cpp:

(WebCore::FeatureObserver::observe):

ASSERT 'domWindow'.

LayoutTests:

• http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash-expected.txt: Added.
• http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash.html: Added.

This test shouldn't crash.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash-expected.txt (added)
• LayoutTests/http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/ContentSecurityPolicy.cpp (modified) (1 diff)
• Source/WebCore/page/FeatureObserver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-08  Mike West  <mkwst@chromium.org>
+
+        Null-check for DOMWindow before feeding it to FeatureObserver.
+        https://bugs.webkit.org/show_bug.cgi?id=98624
+
+        Reviewed by Adam Barth.
+
+        * http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash-expected.txt: Added.
+        * http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash.html: Added.
+            This test shouldn't crash.
+
 2012-10-08  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Mike West  <mkwst@chromium.org>
+
+        Null-check for DOMWindow before feeding it to FeatureObserver.
+        https://bugs.webkit.org/show_bug.cgi?id=98624
+
+        Reviewed by Adam Barth.
+
+        We shouldn't call out to FeatureObserver in
+        ContentSecurityPolicy::didReceiveHeader if the policy's document doesn't
+        have a DOMWindow.
+
+        Test: http/tests/security/contentSecurityPolicy/xmlhttprequest-protected-resource-does-not-crash.html
+
+        * page/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::didReceiveHeader):
+            Null check 'document->domWindow' before passing it on.
+        * page/FeatureObserver.cpp:
+        (WebCore::FeatureObserver::observe):
+            ASSERT 'domWindow'.
+
 2012-10-08  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/page/ContentSecurityPolicy.cpp

@@ -1307 +1307 @@
     if (m_scriptExecutionContext->isDocument()) {
         Document* document = static_cast<Document*>(m_scriptExecutionContext);
-        FeatureObserver::observe(document->domWindow(), FeatureObserver::PrefixedContentSecurityPolicy);
+        if (document->domWindow())
+            FeatureObserver::observe(document->domWindow(), FeatureObserver::PrefixedContentSecurityPolicy);
     }
 

trunk/Source/WebCore/page/FeatureObserver.cpp

@@ -55 +55 @@
 void FeatureObserver::observe(DOMWindow* domWindow, Feature feature)
 {
+    ASSERT(domWindow);
+
     Document* document = domWindow->document();
     if (!document)