Title: [149948] trunk/Source/WebCore
- Revision
- 149948
- Author
- [email protected]
- Date
- 2013-05-11 21:28:15 -0700 (Sat, 11 May 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149947 => 149948)
--- trunk/Source/WebCore/ChangeLog 2013-05-12 00:53:25 UTC (rev 149947)
+++ trunk/Source/WebCore/ChangeLog 2013-05-12 04:28:15 UTC (rev 149948)
@@ -1,3 +1,16 @@
+2013-05-11 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
<rdar://problem/13823864> TextCodecICU complains about ambiguous codec names with current ICU release
Modified: trunk/Source/WebCore/dom/Document.cpp (149947 => 149948)
--- trunk/Source/WebCore/dom/Document.cpp 2013-05-12 00:53:25 UTC (rev 149947)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-05-12 04:28:15 UTC (rev 149948)
@@ -2781,8 +2781,11 @@
Frame* Document::findUnsafeParentScrollPropagationBoundary()
{
Frame* currentFrame = m_frame;
- Frame* ancestorFrame = currentFrame->tree()->parent();
+ if (!currentFrame)
+ return 0;
+ Frame* ancestorFrame = currentFrame->tree()->parent();
+
while (ancestorFrame) {
if (!ancestorFrame->document()->securityOrigin()->canAccess(securityOrigin()))
return currentFrame;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
