Title: [153486] trunk/Source/WebKit2
Revision
153486
Author
[email protected]
Date
2013-07-30 12:38:47 -0700 (Tue, 30 Jul 2013)

Log Message

Null deref under PluginView::handlesPageScaleFactor()
https://bugs.webkit.org/show_bug.cgi?id=119231
<rdar://problem/14440207>

Reviewed by Darin Adler.

Null-check the PluginView in the caller as well.

* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::handlesPageScaleGesture):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (153485 => 153486)


--- trunk/Source/WebKit2/ChangeLog	2013-07-30 19:01:07 UTC (rev 153485)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-30 19:38:47 UTC (rev 153486)
@@ -1,3 +1,16 @@
+2013-07-30  Tim Horton  <[email protected]>
+
+        Null deref under PluginView::handlesPageScaleFactor()
+        https://bugs.webkit.org/show_bug.cgi?id=119231
+        <rdar://problem/14440207>
+
+        Reviewed by Darin Adler.
+
+        Null-check the PluginView in the caller as well.
+
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::handlesPageScaleGesture):
+
 2013-07-30  Patrick Gansterer  <[email protected]>
 
         Remove unused Download*.cpp files

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (153485 => 153486)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp	2013-07-30 19:01:07 UTC (rev 153485)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp	2013-07-30 19:38:47 UTC (rev 153486)
@@ -485,8 +485,7 @@
 
     PluginDocument* pluginDocument = static_cast<PluginDocument*>(m_coreFrame->document());
     PluginView* pluginView = static_cast<PluginView*>(pluginDocument->pluginWidget());
-
-    return pluginView->handlesPageScaleFactor();
+    return pluginView && pluginView->handlesPageScaleFactor();
 }
 
 IntRect WebFrame::contentBounds() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to