merged #111

nlohmann · Aug 14, 2015 · b58a93b · b58a93b
1 parent 6f2da1a
commit b58a93b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -373,6 +373,7 @@ I deeply appreciate the help of the following people.
 - [易思龙](https://github.com/likebeta) implemented a conversion from anonymous enums.
 - [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio.
 - [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators.
+- [Caio Luppi](https://github.com/caiovlp) fixed a bug in the Unicode handling.
 
 Thanks a lot for helping out!
 

diff --git a/src/json.hpp b/src/json.hpp
@@ -4692,6 +4692,8 @@ class basic_json
                         // print character c as \uxxxx
                         sprintf(&result[pos + 1], "u%04x", int(c));
                         pos += 6;
+                        // overwrite trailing null character
+                        result[pos] = '\\';
                     }
                     else
                     {

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -4692,6 +4692,8 @@ class basic_json
                         // print character c as \uxxxx
                         sprintf(&result[pos + 1], "u%04x", int(c));
                         pos += 6;
+                        // overwrite trailing null character
+                        result[pos] = '\\';
                     }
                     else
                     {

diff --git a/test/unit.cpp b/test/unit.cpp
@@ -10194,4 +10194,12 @@ TEST_CASE("regression tests")
         // hexadecimal "a"
         CHECK(j.dump() == "{\"binary string\":\"\\u0000asdf\\n\",\"int64\":10}");
     }
+
+    SECTION("issue #111 - subsequent unicode chars")
+    {
+        std::string bytes{0x7, 0x7};
+        json j;
+        j["string"] = bytes;
+        CHECK(j["string"] == "\u0007\u0007");
+    }
 }