Replace sprintf with hex function, this fixes #149

14d8a91f · Jett · c0132232 · 14d8a91f · 14d8a91f
Commit 14d8a91f authored Nov 19, 2015 by Jett
Show whitespace changes
Inline Side-by-side

Showing with 24 additions and 8 deletions

src/json.hpp src/json.hpp +12 -4

src/json.hpp.re2c src/json.hpp.re2c +12 -4

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -4677,11 +4677,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));
+                        for(const char m : { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f) })
-                        pos += 6;
+                        {
-                        // overwrite trailing null character
+                            result[++pos] = m;
-                        result[pos] = '\\';
+                        }
+                        ++pos;
                    }
                    else
                    {

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -4677,11 +4677,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));
+                        for(const char m : { 'u', '0', '0', hexify(c >> 4), hexify(c & 0x0f) })
-                        pos += 6;
+                        {
-                        // overwrite trailing null character
+                            result[++pos] = m;
-                        result[pos] = '\\';
+                        }
+                        ++pos;
                    }
                    else
                    {