mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Handle control-chars.

Browse Source 
In a certain sense, we shouldn't be seeing them, but this way we at least handle them well.


git-svn-id: http://svn.code.sf.net/p/cjson/code@37 e3330c51-1366-4df0-8b21-3ccf24e3d50e
This commit is contained in:
Dave Gamble 2011-03-02 21:04:46 +00:00
parent b5d2db4d9a
commit b5d57642c2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cJSON.c
View File

@ -141,13 +141,13 @@ static const char *parse_string(cJSON *item,const char *str)
const char *ptr=str+1;char *ptr2;char *out;int len=0;unsigned uc; const char *ptr=str+1;char *ptr2;char *out;int len=0;unsigned uc;
if (*str!='\"') return 0; /* not a string! */ if (*str!='\"') return 0; /* not a string! */
while (*ptr!='\"' && (unsigned char)*ptr>31 && ++len) if (*ptr++ == '\\') ptr++; /* Skip escaped quotes. */ while (*ptr!='\"' && *ptr && ++len) if (*ptr++ == '\\') ptr++; /* Skip escaped quotes. */
out=(char*)cJSON_malloc(len+1); /* This is how long we need for the string, roughly. */ out=(char*)cJSON_malloc(len+1); /* This is how long we need for the string, roughly. */
if (!out) return 0; if (!out) return 0;
ptr=str+1;ptr2=out; ptr=str+1;ptr2=out;
while (*ptr!='\"' && (unsigned char)*ptr>31) while (*ptr!='\"' && *ptr)
{ {
if (*ptr!='\\') *ptr2++=*ptr++; if (*ptr!='\\') *ptr2++=*ptr++;
else else
@ -186,10 +186,10 @@ static const char *parse_string(cJSON *item,const char *str)
/* Render the cstring provided to an escaped version that can be printed. */ /* Render the cstring provided to an escaped version that can be printed. */
static char *print_string_ptr(const char *str) static char *print_string_ptr(const char *str)
{ {
const char *ptr;char *ptr2,*out;int len=0; const char *ptr;char *ptr2,*out;int len=0;unsigned char token;
if (!str) return cJSON_strdup(""); if (!str) return cJSON_strdup("");
ptr=str;while (*ptr && ++len) {if ((unsigned char)*ptr<32 || *ptr=='\"' || *ptr=='\\') len++;ptr++;} ptr=str;while ((token=*ptr) && ++len) {if (strchr("\"\\\b\f\n\r\t",token)) len++; else if (token<32) len+=5;ptr++;}
out=(char*)cJSON_malloc(len+3); out=(char*)cJSON_malloc(len+3);
if (!out) return 0; if (!out) return 0;
@ -202,7 +202,7 @@ static char *print_string_ptr(const char *str)
else else
{ {
*ptr2++='\\'; *ptr2++='\\';
switch (*ptr++) switch (token=*ptr++)
{ {
case '\\': *ptr2++='\\'; break; case '\\': *ptr2++='\\'; break;
case '\"': *ptr2++='\"'; break; case '\"': *ptr2++='\"'; break;
@ -211,7 +211,7 @@ static char *print_string_ptr(const char *str)
case '\n': *ptr2++='n'; break; case '\n': *ptr2++='n'; break;
case '\r': *ptr2++='r'; break; case '\r': *ptr2++='r'; break;
case '\t': *ptr2++='t'; break; case '\t': *ptr2++='t'; break;
default: ptr2--; break; /* eviscerate with prejudice. */ default: sprintf(ptr2,"u%04x",token);ptr2+=5; break; /* escape and print */
} }
} }
} }