From 860a5ae06e7d0d5eb4fd18277d9b32a4de9b8867 Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Thu, 18 Jun 2015 14:01:51 +0900
Subject: [PATCH] Added JSON escape for values between 0x00 and 0x1f, and 0x7f.

---
 include/msgpack/object.hpp | 13 ++++++++++---
 test/json.cpp              | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/include/msgpack/object.hpp b/include/msgpack/object.hpp
index fe40f844..5570844e 100644
--- a/include/msgpack/object.hpp
+++ b/include/msgpack/object.hpp
@@ -29,6 +29,7 @@
 #include <limits>
 #include <ostream>
 #include <typeinfo>
+#include <iomanip>
 
 namespace msgpack {
 
@@ -724,9 +725,15 @@ inline std::ostream& operator<< (std::ostream& s, const msgpack::object& o)
             case '\t':
                 s << "\\t";
                 break;
-            default:
-                s << c;
-                break;
+            default: {
+                unsigned int code = static_cast<unsigned int>(c);
+                if (code < 0x20 || code == 0x7f) {
+                    s << "\\u" << std::hex << std::setw(4) << std::setfill('0') << (code & 0xff);
+                }
+                else {
+                    s << c;
+                }
+            } break;
             }
         }
         s << '"';
diff --git a/test/json.cpp b/test/json.cpp
index e3e2a1a9..e1c74e4b 100644
--- a/test/json.cpp
+++ b/test/json.cpp
@@ -30,3 +30,17 @@ TEST(json, escape)
     ss << o;
     EXPECT_EQ(ss.str(), "\"\\\"\\\\\\/\\b\\f\\n\\r\\tabc\"");
 }
+
+TEST(json, escape_cc)
+{
+    std::string s;
+    for (int i = 0; i < 0x20; ++i)
+        s.push_back(static_cast<char>(i));
+    s.push_back(0x7f);
+    s.push_back(0x20);
+    msgpack::zone z;
+    msgpack::object o(s, z);
+    std::stringstream ss;
+    ss << o;
+    EXPECT_EQ(ss.str(), "\"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f\\u007f \"");
+}