Merge pull request #153 from whackashoe/remove_sprintf

Replace sprintf with hex function, this fixes #149
nlohmann · Dec 7, 2015 · f36f316 · f36f316
2 parents 6f8e36a + 14d8a91
commit f36f316
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -4696,11 +4696,19 @@ class basic_json
                 {
                     if (c >= 0x00 and c <= 0x1f)
                     {
+                        // convert a number 0..15 to its hex representation (0..f)
+                        auto hexify = [](const char v) -> char
+                        {
+                            return (v < 10) ? ('0' + v) : ('a' + v - 10);
+                        };
+
                         // print character c as \uxxxx
-                        sprintf(&result[pos + 1], "u%04x", int(c));
-                        pos += 6;
-                        // overwrite trailing null character
-                        result[pos] = '\\';
+                        for(const char m : { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f) })
+                        {
+                            result[++pos] = m;
+                        }
+
+                        ++pos;
                     }
                     else
                     {

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -4696,11 +4696,19 @@ class basic_json
                 {
                     if (c >= 0x00 and c <= 0x1f)
                     {
+                        // convert a number 0..15 to its hex representation (0..f)
+                        auto hexify = [](const char v) -> char
+                        {
+                            return (v < 10) ? ('0' + v) : ('a' + v - 10);
+                        };
+
                         // print character c as \uxxxx
-                        sprintf(&result[pos + 1], "u%04x", int(c));
-                        pos += 6;
-                        // overwrite trailing null character
-                        result[pos] = '\\';
+                        for(const char m : { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f) })
+                        {
+                            result[++pos] = m;
+                        }
+
+                        ++pos;
                     }
                     else
                     {