Changeset 149948 in webkit

Timestamp:

May 11, 2013 9:28:15 PM (11 years ago)

Author:

Simon Fraser

Message:

Possible crash when going Back while loading PDF
​https://bugs.webkit.org/show_bug.cgi?id=115972

Reviewed by Dan Bernstein.

It's possible for m_frame to be null when Document::findUnsafeParentScrollPropagationBoundary()
is called, so null-check currentFrame.

• dom/Document.cpp:

(WebCore::Document::findUnsafeParentScrollPropagationBoundary):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Possible crash when going Back while loading PDF
+        https://bugs.webkit.org/show_bug.cgi?id=115972
+
+        Reviewed by Dan Bernstein.
+
+        It's possible for m_frame to be null when Document::findUnsafeParentScrollPropagationBoundary()
+        is called, so null-check currentFrame.
+
+        * dom/Document.cpp:
+        (WebCore::Document::findUnsafeParentScrollPropagationBoundary):
+
 2013-05-11  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2782 +2782 @@
 {
     Frame* currentFrame = m_frame;
-    Frame* ancestorFrame = currentFrame->tree()->parent(); 
+    if (!currentFrame)
+        return 0;
+
+    Frame* ancestorFrame = currentFrame->tree()->parent();
 
     while (ancestorFrame) {