Changeset 143204 in webkit

Timestamp:

Feb 18, 2013 5:29:35 AM (11 years ago)

Author:

Christophe Dumez

Message:

[Soup] CookieJarSoup::deleteCookie() should stop looking for the cookie after it is removed
​https://bugs.webkit.org/show_bug.cgi?id=110100

Reviewed by Kenneth Rohde Christiansen.

CookieJarSoup::deleteCookie() retrieves the list of cookies that apply to a given URL, then
iterates through the cookies to find the one with the right name and delete it. However, the
current implementation keeps on comparing cookie names after the cookie was removed. This
patch introduces a "wasDeleted" boolean to stop comparing cookie names after the cookie was
deleted. Note that we cannot break as soon as the cookie is found as we need to keep iterating
so that the cookies get freed by GOwnPtr.

No new tests, no behavior change.

• platform/network/soup/CookieJarSoup.cpp:

(WebCore::deleteCookie):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        [Soup] CookieJarSoup::deleteCookie() should stop looking for the cookie after it is removed
+        https://bugs.webkit.org/show_bug.cgi?id=110100
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        CookieJarSoup::deleteCookie() retrieves the list of cookies that apply to a given URL, then
+        iterates through the cookies to find the one with the right name and delete it. However, the
+        current implementation keeps on comparing cookie names after the cookie was removed. This
+        patch introduces a "wasDeleted" boolean to stop comparing cookie names after the cookie was
+        deleted. Note that we cannot break as soon as the cookie is found as we need to keep iterating
+        so that the cookies get freed by GOwnPtr.
+
+        No new tests, no behavior change.
+
+        * platform/network/soup/CookieJarSoup.cpp:
+        (WebCore::deleteCookie):
+
 2013-02-18  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -170 +170 @@
 
     CString cookieName = name.utf8();
+    bool wasDeleted = false;
     for (GSList* iter = cookies.get(); iter; iter = g_slist_next(iter)) {
         GOwnPtr<SoupCookie> cookie(static_cast<SoupCookie*>(iter->data));
-        if (cookieName == cookie->name)
+        if (!wasDeleted && cookieName == cookie->name) {
             soup_cookie_jar_delete_cookie(jar, cookie.get());
+            wasDeleted = true;
+        }
     }
 }