Changeset 232066 in webkit

Timestamp:

May 22, 2018 8:09:57 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebDriver: Network process crash when running imported/w3c/webdriver/tests/delete_cookie/delete.py::test_unknown_cookie
​https://bugs.webkit.org/show_bug.cgi?id=185867

Reviewed by Michael Catanzaro.

We need to null check the value returned by URL::createSoupURI() before passing it to soup.

• platform/network/soup/CookieJarSoup.cpp:

(WebCore::setCookiesFromDOM):
(WebCore::cookiesForSession):
(WebCore::getRawCookies):
(WebCore::deleteCookie):

• platform/network/soup/NetworkStorageSessionSoup.cpp:

(WebCore::NetworkStorageSession::getCookies):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/CookieJarSoup.cpp (modified) (4 diffs)
• platform/network/soup/NetworkStorageSessionSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebDriver: Network process crash when running imported/w3c/webdriver/tests/delete_cookie/delete.py::test_unknown_cookie
+        https://bugs.webkit.org/show_bug.cgi?id=185867
+
+        Reviewed by Michael Catanzaro.
+
+        We need to null check the value returned by URL::createSoupURI() before passing it to soup.
+
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::setCookiesFromDOM):
+        (WebCore::cookiesForSession):
+        (WebCore::getRawCookies):
+        (WebCore::deleteCookie):
+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
+        (WebCore::NetworkStorageSession::getCookies):
+
 2018-05-22  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp

@@ -56 +56 @@
     UNUSED_PARAM(frameID);
     UNUSED_PARAM(pageID);
+    GUniquePtr<SoupURI> origin = url.createSoupURI();
+    if (!origin)
+        return;
+
+    GUniquePtr<SoupURI> firstPartyURI = firstParty.createSoupURI();
+    if (!firstPartyURI)
+        return;
+
+    // Get existing cookies for this origin.
     SoupCookieJar* jar = session.cookieStorage();
-
-    GUniquePtr<SoupURI> origin = url.createSoupURI();
-    GUniquePtr<SoupURI> firstPartyURI = firstParty.createSoupURI();
-
-    // Get existing cookies for this origin.
     GSList* existingCookies = soup_cookie_jar_get_cookie_list(jar, origin.get(), TRUE);
 
@@ -89 +93 @@
 {
     GUniquePtr<SoupURI> uri = url.createSoupURI();
+    if (!uri)
+        return { { }, false };
+
     GSList* cookies = soup_cookie_jar_get_cookie_list(session.cookieStorage(), uri.get(), forHTTPHeader);
     bool didAccessSecureCookies = false;
@@ -155 +162 @@
     rawCookies.clear();
     GUniquePtr<SoupURI> uri = url.createSoupURI();
+    if (!uri)
+        return false;
+
     GUniquePtr<GSList> cookies(soup_cookie_jar_get_cookie_list(session.cookieStorage(), uri.get(), TRUE));
     if (!cookies)
@@ -180 +190 @@
 void deleteCookie(const NetworkStorageSession& session, const URL& url, const String& name)
 {
+    GUniquePtr<SoupURI> uri = url.createSoupURI();
+    if (!uri)
+        return;
+
     SoupCookieJar* jar = session.cookieStorage();
-
-    GUniquePtr<SoupURI> uri = url.createSoupURI();
     GUniquePtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
     if (!cookies)

trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp

@@ -319 +319 @@
     Vector<Cookie> cookies;
     GUniquePtr<SoupURI> uri = url.createSoupURI();
+    if (!uri)
+        return cookies;
+
     GUniquePtr<GSList> cookiesList(soup_cookie_jar_get_cookie_list(cookieStorage(), uri.get(), TRUE));
     for (GSList* item = cookiesList.get(); item; item = g_slist_next(item)) {