j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #153 from whackashoe/remove_sprintf

Browse source 
Replace sprintf with hex function, this fixes #149
This commit is contained in:
Niels 2015-12-07 20:35:43 +01:00
commit f36f316fc7
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/json.hpp
View file

@ -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
{

16
src/json.hpp.re2c
View file

@ -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
{