From 280752aa618928f8fd1aad71e6c1e31f64834ed2 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Fri, 4 Jan 2013 12:49:25 +0900
Subject: [PATCH] Bug 826159 - Turn nsICookie.value into AUTF8String. r=bz

---
 .../document/test/test_non-ascii-cookie.html  | 29 +++++++++++++++++--
 netwerk/cookie/Makefile.in                    |  4 +++
 netwerk/cookie/nsCookie.cpp                   | 11 +++++--
 netwerk/cookie/nsICookie.idl                  |  4 +--
 4 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/content/html/document/test/test_non-ascii-cookie.html b/content/html/document/test/test_non-ascii-cookie.html
index 0f0a4bbb820f..fc307265a659 100644
--- a/content/html/document/test/test_non-ascii-cookie.html
+++ b/content/html/document/test/test_non-ascii-cookie.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=784367
 -->
 <head>
   <meta charset="utf-8">
-  <title>Test for non-ASCII document.cookie</title>
+  <title>Test for non-ASCII cookie values</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
@@ -18,12 +18,37 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=784367
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for non-ASCII document.cookie **/
+/** Test for non-ASCII cookie values **/
+
+var [Cc, Ci] = [SpecialPowers.Cc, SpecialPowers.Ci];
+
+var cm = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager);
+function getCookieFromManager() {
+  var values = [];
+  var host = location.hostname;
+  var path = location.pathname;
+  path = path.substring(0, path.lastIndexOf("/") + 1);
+  var e = cm.enumerator;
+  while (e.hasMoreElements()) {
+    var cookie = e.getNext().QueryInterface(Ci.nsICookie);
+    if (!cookie) {
+      break;
+    }
+    if (host != cookie.host || path != cookie.path) {
+      continue;
+    }
+    values.push(cookie.name + "=" + cookie.value);
+  }
+  return values.join("; ");
+}
+
 var c = document.cookie;
 is(document.cookie, 'abc=012©ABC\ufffdDEF', "document.cookie should be decoded as UTF-8");
+is(getCookieFromManager(), document.cookie, "nsICookieManager should be consistent with document.cookie");
 var newCookie = 'def=∼≩≭≧∯≳≲≣∽≸≸∺≸∠≯≮≥≲≲≯≲∽≡≬≥≲≴∨∱∩∾';
 document.cookie = newCookie;
 is(document.cookie, c + '; ' + newCookie, "document.cookie should be encoded as UTF-8");
+is(getCookieFromManager(), document.cookie, "nsICookieManager should be consistent with document.cookie");
 var date1 = new Date();
 date1.setTime(0);
 document.cookie = newCookie + 'def=;expires=' + date1.toGMTString();
diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in
index b33da831ee8f..c3f1151b99e5 100644
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -54,6 +54,10 @@ CPPSRCS += \
 		CookieServiceChild.cpp \
 		$(NULL)
 
+LOCAL_INCLUDES	= \
+		-I$(topsrcdir)/intl/uconv/src \
+		$(NULL)
+
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS += test/unit_ipc
diff --git a/netwerk/cookie/nsCookie.cpp b/netwerk/cookie/nsCookie.cpp
index 56bdb23ac425..e5cc845a4966 100644
--- a/netwerk/cookie/nsCookie.cpp
+++ b/netwerk/cookie/nsCookie.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsCookie.h"
+#include "nsUTF8ConverterService.h"
 #include <stdlib.h>
 
 /******************************************************************************
@@ -77,8 +78,14 @@ nsCookie::Create(const nsACString &aName,
                  bool              aIsSecure,
                  bool              aIsHttpOnly)
 {
+  // Ensure mValue contains a valid UTF-8 sequence. Otherwise XPConnect will
+  // truncate the string after the first invalid octet.
+  nsUTF8ConverterService converter;
+  nsAutoCString aUTF8Value;
+  converter.ConvertStringToUTF8(aValue, "UTF-8", false, true, 1, aUTF8Value);
+
   // find the required string buffer size, adding 4 for the terminating nulls
-  const uint32_t stringLength = aName.Length() + aValue.Length() +
+  const uint32_t stringLength = aName.Length() + aUTF8Value.Length() +
                                 aHost.Length() + aPath.Length() + 4;
 
   // allocate contiguous space for the nsCookie and its strings -
@@ -90,7 +97,7 @@ nsCookie::Create(const nsACString &aName,
   // assign string members
   char *name, *value, *host, *path, *end;
   name = static_cast<char *>(place) + sizeof(nsCookie);
-  StrBlockCopy(aName, aValue, aHost, aPath,
+  StrBlockCopy(aName, aUTF8Value, aHost, aPath,
                name, value, host, path, end);
 
   // If the creationTime given to us is higher than the running maximum, update
diff --git a/netwerk/cookie/nsICookie.idl b/netwerk/cookie/nsICookie.idl
index 76274bbec6e0..20fa9cf124ac 100644
--- a/netwerk/cookie/nsICookie.idl
+++ b/netwerk/cookie/nsICookie.idl
@@ -14,7 +14,7 @@
 typedef long nsCookieStatus;
 typedef long nsCookiePolicy;
 
-[scriptable, uuid(E9FCB9A4-D376-458f-B720-E65E7DF593BC)]
+[scriptable, uuid(8684966b-1877-4f0f-8155-be4490b96bf7)]
 
 interface nsICookie : nsISupports {
 
@@ -26,7 +26,7 @@ interface nsICookie : nsISupports {
     /**
      * the cookie value
      */
-    readonly attribute ACString value;
+    readonly attribute AUTF8String value;
 
     /**
      * true if the cookie is a domain cookie, false otherwise
