Title: [205495] trunk/Source/WebKit/win
- Revision
- 205495
- Author
- [email protected]
- Date
- 2016-09-06 11:21:26 -0700 (Tue, 06 Sep 2016)
Log Message
[Win] Null pointer crash under WebView::scrollOffset.
https://bugs.webkit.org/show_bug.cgi?id=161620
Reviewed by Darin Adler.
Added null pointer checks.
* WebView.cpp:
(WebView::scrollOffset):
(WebView::scrollBy):
(WebView::visibleContentRect):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (205494 => 205495)
--- trunk/Source/WebKit/win/ChangeLog 2016-09-06 18:18:10 UTC (rev 205494)
+++ trunk/Source/WebKit/win/ChangeLog 2016-09-06 18:21:26 UTC (rev 205495)
@@ -1,3 +1,17 @@
+2016-09-06 Per Arne Vollan <[email protected]>
+
+ [Win] Null pointer crash under WebView::scrollOffset.
+ https://bugs.webkit.org/show_bug.cgi?id=161620
+
+ Reviewed by Darin Adler.
+
+ Added null pointer checks.
+
+ * WebView.cpp:
+ (WebView::scrollOffset):
+ (WebView::scrollBy):
+ (WebView::visibleContentRect):
+
2016-09-03 Darin Adler <[email protected]>
Streamline DOMImplementation, and move it to our new DOM exception system
Modified: trunk/Source/WebKit/win/WebView.cpp (205494 => 205495)
--- trunk/Source/WebKit/win/WebView.cpp 2016-09-06 18:18:10 UTC (rev 205494)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-09-06 18:21:26 UTC (rev 205495)
@@ -5493,6 +5493,9 @@
if (!offset)
return E_POINTER;
+ if (!m_page || !m_page->mainFrame().view())
+ return E_FAIL;
+
IntPoint scrollPosition = m_page->mainFrame().view()->scrollPosition();
float scaleFactor = deviceScaleFactor();
scrollPosition.scale(scaleFactor, scaleFactor);
@@ -5507,6 +5510,9 @@
if (!offset)
return E_POINTER;
+ if (!m_page || !m_page->mainFrame().view())
+ return E_FAIL;
+
IntSize scrollDelta(offset->x, offset->y);
scrollDelta.scale(1.0f / deviceScaleFactor());
m_page->mainFrame().view()->scrollBy(scrollDelta);
@@ -5518,6 +5524,9 @@
if (!rect)
return E_POINTER;
+ if (!m_page || !m_page->mainFrame().view())
+ return E_FAIL;
+
FloatRect visibleContent = m_page->mainFrame().view()->visibleContentRect();
visibleContent.scale(deviceScaleFactor());
rect->left = (LONG) visibleContent.x();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
