From 69a5ce00499e7b6b45f501e189d82f031a4cb3cd Mon Sep 17 00:00:00 2001 From: "ap@apple.com" Date: Thu, 22 Sep 2011 01:01:26 +0000 Subject: [PATCH] [WK2] UIProcess should check that WebProcess isn't sending unexpected file: URLs to it https://bugs.webkit.org/show_bug.cgi?id=68573 Unreviewed follow-up fix. * UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::checkURLReceivedFromWebProcess): Just like we allow null URLs, also allow empty strings. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95690 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 10 ++++++++++ Source/WebKit2/UIProcess/WebProcessProxy.cpp | 3 +++ 2 files changed, 13 insertions(+) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index fcf40f0..8ef0ed0 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,13 @@ +2011-09-21 Alexey Proskuryakov + + [WK2] UIProcess should check that WebProcess isn't sending unexpected file: URLs to it + https://bugs.webkit.org/show_bug.cgi?id=68573 + + Unreviewed follow-up fix. + + * UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::checkURLReceivedFromWebProcess): + Just like we allow null URLs, also allow empty strings. + 2011-09-21 Julien Chaffraix Crash in RenderBox::paintMaskImages when GraphicsContext's painting is disabled diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp index fa80fa8..4fdfdd9 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp @@ -216,6 +216,9 @@ void WebProcessProxy::willLoadHTMLStringWithBaseURL(const String& urlString) bool WebProcessProxy::checkURLReceivedFromWebProcess(const String& urlString) { + if (urlString.isEmpty()) + return true; + return checkURLReceivedFromWebProcess(KURL(KURL(), urlString)); } -- 2.7.4