1 files changed, 49 insertions, 98 deletions

diff --git a/base/json/string_escape.cc b/base/json/string_escape.cc
index a3b0735..10ea670 100644
--- a/base/json/string_escape.cc
+++ b/base/json/string_escape.cc
@@ -8,56 +8,40 @@
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversion_utils.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/third_party/icu/icu_utf.h"
 
 namespace base {
 
 namespace {
 
-// Format string for printing a \uXXXX escape sequence.
-const char kU16EscapeFormat[] = "\\u%04X";
-
-// The code point to output for an invalid input code unit.
-const uint32 kReplacementCodePoint = 0xFFFD;
-
-// Used below in EscapeSpecialCodePoint().
-COMPILE_ASSERT('<' == 0x3C, less_than_sign_is_0x3c);
-
-// Try to escape the |code_point| if it is a known special character. If
-// successful, returns true and appends the escape sequence to |dest|. This
-// isn't required by the spec, but it's more readable by humans.
-bool EscapeSpecialCodePoint(uint32 code_point, std::string* dest) {
+// Try to escape |c| as a "SingleEscapeCharacter" (\n, etc).  If successful,
+// returns true and appends the escape sequence to |dst|.  This isn't required
+// by the spec, but it's more readable by humans than the \uXXXX alternatives.
+template<typename CHAR>
+static bool JsonSingleEscapeChar(const CHAR c, std::string* dst) {
   // WARNING: if you add a new case here, you need to update the reader as well.
   // Note: \v is in the reader, but not here since the JSON spec doesn't
   // allow it.
-  switch (code_point) {
+  switch (c) {
     case '\b':
-      dest->append("\\b");
+      dst->append("\\b");
       break;
     case '\f':
-      dest->append("\\f");
+      dst->append("\\f");
       break;
     case '\n':
-      dest->append("\\n");
+      dst->append("\\n");
       break;
     case '\r':
-      dest->append("\\r");
+      dst->append("\\r");
       break;
     case '\t':
-      dest->append("\\t");
+      dst->append("\\t");
       break;
     case '\\':
-      dest->append("\\\\");
+      dst->append("\\\\");
       break;
     case '"':
-      dest->append("\\\"");
-      break;
-    // Escape < to prevent script execution; escaping > is not necessary and
-    // not doing so save a few bytes.
-    case '<':
-      dest->append("\\u003C");
+      dst->append("\\\"");
       break;
     default:
       return false;
@@ -65,90 +49,57 @@ bool EscapeSpecialCodePoint(uint32 code_point, std::string* dest) {
   return true;
 }
 
-template <typename S>
-bool EscapeJSONStringImpl(const S& str, bool put_in_quotes, std::string* dest) {
-  bool did_replacement = false;
-
+template <class STR>
+void JsonDoubleQuoteT(const STR& str,
+                      bool put_in_quotes,
+                      std::string* dst) {
   if (put_in_quotes)
-    dest->push_back('"');
-
-  // Casting is necessary because ICU uses int32. Try and do so safely.
-  CHECK_LE(str.length(), static_cast<size_t>(kint32max));
-  const int32 length = static_cast<int32>(str.length());
-
-  for (int32 i = 0; i < length; ++i) {
-    uint32 code_point;
-    if (!ReadUnicodeCharacter(str.data(), length, &i, &code_point)) {
-      code_point = kReplacementCodePoint;
-      did_replacement = true;
+    dst->push_back('"');
+
+  for (typename STR::const_iterator it = str.begin(); it != str.end(); ++it) {
+    typename ToUnsigned<typename STR::value_type>::Unsigned c = *it;
+    if (!JsonSingleEscapeChar(c, dst)) {
+      if (c < 32 || c > 126 || c == '<' || c == '>') {
+        // 1. Escaping <, > to prevent script execution.
+        // 2. Technically, we could also pass through c > 126 as UTF8, but this
+        //    is also optional.  It would also be a pain to implement here.
+        unsigned int as_uint = static_cast<unsigned int>(c);
+        base::StringAppendF(dst, "\\u%04X", as_uint);
+      } else {
+        unsigned char ascii = static_cast<unsigned char>(*it);
+        dst->push_back(ascii);
+      }
     }
-
-    if (EscapeSpecialCodePoint(code_point, dest))
-      continue;
-
-    // Escape non-printing characters.
-    if (code_point < 32)
-      base::StringAppendF(dest, kU16EscapeFormat, code_point);
-    else
-      WriteUnicodeCharacter(code_point, dest);
   }
 
   if (put_in_quotes)
-    dest->push_back('"');
-
-  return !did_replacement;
+    dst->push_back('"');
 }
 
 }  // namespace
 
-bool EscapeJSONString(const StringPiece& str,
-                      bool put_in_quotes,
-                      std::string* dest) {
-  return EscapeJSONStringImpl(str, put_in_quotes, dest);
+void JsonDoubleQuote(const StringPiece& str,
+                     bool put_in_quotes,
+                     std::string* dst) {
+  JsonDoubleQuoteT(str, put_in_quotes, dst);
 }
 
-bool EscapeJSONString(const StringPiece16& str,
-                      bool put_in_quotes,
-                      std::string* dest) {
-  return EscapeJSONStringImpl(str, put_in_quotes, dest);
-}
-
-std::string GetQuotedJSONString(const StringPiece& str) {
-  std::string dest;
-  bool ok = EscapeJSONStringImpl(str, true, &dest);
-  DCHECK(ok);
-  return dest;
+std::string GetDoubleQuotedJson(const StringPiece& str) {
+  std::string dst;
+  JsonDoubleQuote(str, true, &dst);
+  return dst;
 }
 
-std::string GetQuotedJSONString(const StringPiece16& str) {
-  std::string dest;
-  bool ok = EscapeJSONStringImpl(str, true, &dest);
-  DCHECK(ok);
-  return dest;
+void JsonDoubleQuote(const StringPiece16& str,
+                     bool put_in_quotes,
+                     std::string* dst) {
+  JsonDoubleQuoteT(str, put_in_quotes, dst);
 }
 
-std::string EscapeBytesAsInvalidJSONString(const StringPiece& str,
-                                           bool put_in_quotes) {
-  std::string dest;
-
-  if (put_in_quotes)
-    dest.push_back('"');
-
-  for (StringPiece::const_iterator it = str.begin(); it != str.end(); ++it) {
-    ToUnsigned<StringPiece::value_type>::Unsigned c = *it;
-    if (EscapeSpecialCodePoint(c, &dest))
-      continue;
-
-    if (c < 32 || c > 126)
-      base::StringAppendF(&dest, kU16EscapeFormat, c);
-    else
-      dest.push_back(*it);
-  }
-
-  if (put_in_quotes)
-    dest.push_back('"');
-
-  return dest;
+std::string GetDoubleQuotedJson(const StringPiece16& str) {
+  std::string dst;
+  JsonDoubleQuote(str, true, &dst);
+  return dst;
 }
 
 }  // namespace base