Title: [222520] trunk/Source/WebKit
Revision
222520
Author
[email protected]
Date
2017-09-26 13:42:14 -0700 (Tue, 26 Sep 2017)

Log Message

Harden our access to the vector of URL schemes.
https://bugs.webkit.org/show_bug.cgi?id=177470
<rdar://problem/33881522>

Reviewed by Chris Dumez.

Instead of asserting, use MESSAGE_CHECK so that we actually refuse to access an invalid iterator.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::startURLSchemeTask):
(WebKit::WebPageProxy::stopURLSchemeTask):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (222519 => 222520)


--- trunk/Source/WebKit/ChangeLog	2017-09-26 20:36:29 UTC (rev 222519)
+++ trunk/Source/WebKit/ChangeLog	2017-09-26 20:42:14 UTC (rev 222520)
@@ -1,3 +1,17 @@
+2017-09-26  Brent Fulgham  <[email protected]>
+
+        Harden our access to the vector of URL schemes.
+        https://bugs.webkit.org/show_bug.cgi?id=177470
+        <rdar://problem/33881522>
+
+        Reviewed by Chris Dumez.
+
+        Instead of asserting, use MESSAGE_CHECK so that we actually refuse to access an invalid iterator.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::startURLSchemeTask):
+        (WebKit::WebPageProxy::stopURLSchemeTask):
+
 2017-09-26  Jer Noble  <[email protected]>
 
         Thrown ObjC exception when right clicking on <img> containing mp4 link

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (222519 => 222520)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2017-09-26 20:36:29 UTC (rev 222519)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2017-09-26 20:42:14 UTC (rev 222520)
@@ -7021,7 +7021,7 @@
 void WebPageProxy::startURLSchemeTask(uint64_t handlerIdentifier, uint64_t taskIdentifier, const WebCore::ResourceRequest& request)
 {
     auto iterator = m_urlSchemeHandlersByIdentifier.find(handlerIdentifier);
-    ASSERT(iterator != m_urlSchemeHandlersByIdentifier.end());
+    MESSAGE_CHECK(iterator != m_urlSchemeHandlersByIdentifier.end());
 
     iterator->value->startTask(*this, taskIdentifier, request);
 }
@@ -7029,7 +7029,7 @@
 void WebPageProxy::stopURLSchemeTask(uint64_t handlerIdentifier, uint64_t taskIdentifier)
 {
     auto iterator = m_urlSchemeHandlersByIdentifier.find(handlerIdentifier);
-    ASSERT(iterator != m_urlSchemeHandlersByIdentifier.end());
+    MESSAGE_CHECK(iterator != m_urlSchemeHandlersByIdentifier.end());
 
     iterator->value->stopTask(*this, taskIdentifier);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to