Changeset 185301 in webkit

Timestamp:

Jun 7, 2015, 7:42:28 AM (10 years ago)

Author:

Antti Koivisto

Message:

CrashTracer: [USER] com.apple.WebKit.WebContent.Development at com.apple.WebCore: WebCore::FrameLoader::subresourceCachePolicy const + 11
​https://bugs.webkit.org/show_bug.cgi?id=145736
rdar://problem/21246971

Reviewed by David Kilzer.

No repro, no test.

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::setCSSStyleSheet):

Null check frame. It may be null during frame teardown.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLLinkElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-07  Antti Koivisto  <antti@apple.com>
+
+        CrashTracer: [USER] com.apple.WebKit.WebContent.Development at com.apple.WebCore: WebCore::FrameLoader::subresourceCachePolicy const + 11
+        https://bugs.webkit.org/show_bug.cgi?id=145736
+        rdar://problem/21246971
+
+        Reviewed by David Kilzer.
+
+        No repro, no test.
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::setCSSStyleSheet):
+
+            Null check frame. It may be null during frame teardown.
+
 2015-06-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -318 +318 @@
         return;
     }
+    auto* frame = document().frame();
+    if (!frame)
+        return;
+
     // Completing the sheet load may cause scripts to execute.
     Ref<HTMLLinkElement> protect(*this);
 
     CSSParserContext parserContext(document(), baseURL, charset);
-    auto cachePolicy = document().frame()->loader().subresourceCachePolicy();
+    auto cachePolicy = frame->loader().subresourceCachePolicy();
 
     if (RefPtr<StyleSheetContents> restoredSheet = const_cast<CachedCSSStyleSheet*>(cachedStyleSheet)->restoreParsedStyleSheet(parserContext, cachePolicy)) {