Changeset 116601 in webkit

Timestamp:

May 9, 2012 8:30:48 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Cookie parsing issue. If the cookie value provided was (") then the browser creates a session cookie instead.
​https://bugs.webkit.org/show_bug.cgi?id=85775

Patch by Jason Liu <​jason.liu@torchmobile.com.cn> on 2012-05-09
Reviewed by Rob Buis.

Source/WebCore:

Make CookieParser::parseOneCookie handle (cookiename="cookievalue;expires=xxxx) correctly.
This cookie's value is "cookievalue not "cookievalue;expires=xxxx.

Test: http/tests/cookies/single-quoted-value.html

• platform/blackberry/CookieParser.cpp:

(WebCore::CookieParser::parseOneCookie):

LayoutTests:

• http/tests/cookies/script-tests/single-quoted-value.js: Added.
• http/tests/cookies/single-quoted-value-expected.txt: Added.
• http/tests/cookies/single-quoted-value.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cookies/script-tests/single-quoted-value.js (added)
• LayoutTests/http/tests/cookies/single-quoted-value-expected.txt (added)
• LayoutTests/http/tests/cookies/single-quoted-value.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/blackberry/CookieParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-09  Jason Liu  <jason.liu@torchmobile.com.cn>
+
+        [BlackBerry] Cookie parsing issue. If the cookie value provided was (") then the browser creates a session cookie instead.
+        https://bugs.webkit.org/show_bug.cgi?id=85775
+
+        Reviewed by Rob Buis.
+
+        * http/tests/cookies/script-tests/single-quoted-value.js: Added.
+        * http/tests/cookies/single-quoted-value-expected.txt: Added.
+        * http/tests/cookies/single-quoted-value.html: Added.
+
 2012-05-09  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-09  Jason Liu  <jason.liu@torchmobile.com.cn>
+
+        [BlackBerry] Cookie parsing issue. If the cookie value provided was (") then the browser creates a session cookie instead.
+        https://bugs.webkit.org/show_bug.cgi?id=85775
+
+        Reviewed by Rob Buis.
+
+        Make CookieParser::parseOneCookie handle (cookiename="cookievalue;expires=xxxx) correctly.
+        This cookie's value is "cookievalue not "cookievalue;expires=xxxx.
+
+        Test: http/tests/cookies/single-quoted-value.html
+
+        * platform/blackberry/CookieParser.cpp:
+        (WebCore::CookieParser::parseOneCookie):
+
 2012-05-09  Raymond Liu  <raymond.liu@intel.com>
 

trunk/Source/WebCore/platform/blackberry/CookieParser.cpp

@@ -110 +110 @@
     unsigned pairEnd = start; // Pair end contains always the position of the ';'
 
-    // find the *first* ';' and the '=' (if they exist)
-    bool quoteFound = false;
+    // Find the first ';' which is not double-quoted and the '=' (if they exist).
     bool foundEqual = false;
-    while (pairEnd < end && (cookie[pairEnd] != ';' || quoteFound)) {
-        if (tokenEnd == start && cookie[pairEnd] == '=') {
-            tokenEnd = pairEnd;
-            foundEqual = true;
-        }
-        if (cookie[pairEnd] == '"')
-            quoteFound = !quoteFound;
+    while (pairEnd < end && cookie[pairEnd] != ';') {
+        if (cookie[pairEnd] == '=') {
+            if (tokenEnd == start) {
+                tokenEnd = pairEnd;
+                foundEqual = true;
+            }
+        } else if (cookie[pairEnd] == '"') {
+            size_t secondQuotePosition = cookie.find('"', pairEnd + 1);
+            if (secondQuotePosition != notFound && secondQuotePosition <= end) {
+                pairEnd = secondQuotePosition + 1;
+                continue;
+            }
+        }
         pairEnd++;
     }