REGRESSION (r137487): Crashes in editing/execCommand/indent-paragraphs.html on GTK...

https://bugs.webkit.org/show_bug.cgi?id=105042

Reviewed by Gustavo Noronha Silva.

Source/WebCore:

Explicitly handle the situation where the creation of a SoupURI fails. This
can happen if the URI is invalid. In that case the constructor returns null.

No new tests. This patch unskips a failing test.

* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::createSoupRequestAndMessageForHandle): Handle a null Soup URI.

LayoutTests:

Unskip a test which is now passing.

* platform/gtk/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@140006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 61638c0..ea745a5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-17  Martin Robinson  <mrobinson@igalia.com>
+
+        REGRESSION (r137487): Crashes in editing/execCommand/indent-paragraphs.html on GTK, EFL
+        https://bugs.webkit.org/show_bug.cgi?id=105042
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Unskip a test which is now passing.
+
+        * platform/gtk/TestExpectations:
+
 2013-01-17  Nate Chapin  <japhet@chromium.org>
 
         Enable reuse of cached main resources

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index b684586..9b17533 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -481,8 +481,6 @@ webkit.org/b/100688 editing/text-iterator/backward-textiterator-first-letter-cra
 
 webkit.org/b/104684 fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html [ Crash Pass ]
 
-webkit.org/b/105042 editing/execCommand/indent-paragraphs.html [ Crash ]
-
 webkit.org/b/105689 [ Debug ] plugins/npruntime/embed-property-iframe-equality.html [ Crash ]
 
 webkit.org/b/106922 accessibility/aria-tables.html [ Crash ]

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 716b812..fc61eee 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2013-01-17  Martin Robinson  <mrobinson@igalia.com>
+
+        REGRESSION (r137487): Crashes in editing/execCommand/indent-paragraphs.html on GTK, EFL
+        https://bugs.webkit.org/show_bug.cgi?id=105042
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Explicitly handle the situation where the creation of a SoupURI fails. This
+        can happen if the URI is invalid. In that case the constructor returns null.
+
+        No new tests. This patch unskips a failing test.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::createSoupRequestAndMessageForHandle): Handle a null Soup URI.
+
 2013-01-17  Nate Chapin  <japhet@chromium.org>
 
         Enable reuse of cached main resources

diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 2433275..d7b930b 100644 (file)
--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -985,6 +985,9 @@ static bool createSoupRequestAndMessageForHandle(ResourceHandle* handle, const R
     GOwnPtr<GError> error;
 
     GOwnPtr<SoupURI> soupURI(request.soupURI());
+    if (!soupURI)
+        return false;
+
     d->m_soupRequest = adoptGRef(soup_requester_request_uri(requester, soupURI.get(), &error.outPtr()));
     if (error) {
         d->m_soupRequest.clear();