summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-10-22 11:30:30 +0200
committerAllan Sandfeld Jensen <allan.jensen@digia.com>2014-10-22 12:08:38 +0200
commit119e109b3efa7c5d922dcc0df09987692e6a3474 (patch)
treea829d73436234e13c6b4ecd60017e7839744176f /Source
parent35bf5c211b148af98bba00eaf662d6dbdefbf24a (diff)
downloadqtwebkit-119e109b3efa7c5d922dcc0df09987692e6a3474.tar.gz
Do not schedule navigation to invalid URL
Fix an assert triggered by navigation to a fragment URL of an unset URL. The code was assuming the string given was a valid encoded URL, so we shouldn't continue if the completed URL is invalid. Task-number: QTBUG-38546 Change-Id: I377b09814150ae9926de95efe3f3e2e750145c4a Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/page/DOMWindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 5b0664f00..670191f41 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1811,7 +1811,7 @@ void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DO
return;
KURL completedURL = firstFrame->document()->completeURL(urlString);
- if (completedURL.isNull())
+ if (completedURL.isNull() || !completedURL.isValid())
return;
if (isInsecureScriptAccess(activeWindow, completedURL))