Attachment 319429 Details for Bug 176140 – Patch

[patch] Patch

bug-176140-20170830201155.patch (text/plain), 1.70 KB, created by Michael Catanzaro on 2017-08-30 18:11:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2017-08-30 18:11:55 PDT

Size: 1.70 KB

patch

obsolete

>Subversion Revision: 221284
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c546fee761711ca0dd3ac95a08cc402f77af19f2..6cd82fd384d6f7ec4959351c34de3e605ea0153d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2017-08-30  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        REGRESSION(r221226): [SOUP] libsoup-CRITICAL **: soup_cookies_to_cookie_header: assertion 'cookies != NULL' failed
>+        https://bugs.webkit.org/show_bug.cgi?id=176140
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This should fix unexpected stderr output in several tests.
>+
>+        * platform/network/soup/CookieJarSoup.cpp:
>+        (WebCore::cookiesForSession):
>+
> 2017-08-28  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         REGRESSION(r220278): Web Inspector: ContextMenu items are not getting triggered
>diff --git a/Source/WebCore/platform/network/soup/CookieJarSoup.cpp b/Source/WebCore/platform/network/soup/CookieJarSoup.cpp
>index 107b871fcf8d6943198d97324c94b0a7b5f5fdb6..b4d374590ae117f767eaf9b3fa8c79c3d563b25a 100644
>--- a/Source/WebCore/platform/network/soup/CookieJarSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/CookieJarSoup.cpp
>@@ -86,8 +86,10 @@ static std::pair<String, bool> cookiesForSession(const NetworkStorageSession& se
> {
>     GUniquePtr<SoupURI> uri = url.createSoupURI();
>     GSList* cookies = soup_cookie_jar_get_cookie_list(session.cookieStorage(), uri.get(), forHTTPHeader);
>-    bool didAccessSecureCookies = false;
>+    if (!cookies)
>+        return { { }, false };
> 
>+    bool didAccessSecureCookies = false;
>     // libsoup should omit secure cookies itself if the protocol is not https.
>     if (url.protocolIs("https")) {
>         GSList* item = cookies;

Flags:

cgarcia: review+
cgarcia: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 176140: 319429