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

Merge pull request #24 from FSMaxB/fix_code_order

Browse Source 
Fix printing of empty string pointers
This commit is contained in:
Kevin Branigan 2015-10-25 23:48:38 -04:00
commit e95313adad
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cJSON.c
View File

@ -253,6 +253,15 @@ static const char *parse_string(cJSON *item,const char *str)
static char *print_string_ptr(const char *str,printbuffer *p) static char *print_string_ptr(const char *str,printbuffer *p)
{ {
const char *ptr;char *ptr2,*out;int len=0,flag=0;unsigned char token; const char *ptr;char *ptr2,*out;int len=0,flag=0;unsigned char token;
if (!str)
{
if (p) out=ensure(p,3);
else out=(char*)cJSON_malloc(3);
if (!out) return 0;
strcpy(out,"\"\"");
return out;
}
for (ptr=str;*ptr;ptr++) flag|=((*ptr>0 && *ptr<32)||(*ptr=='\"')||(*ptr=='\\'))?1:0; for (ptr=str;*ptr;ptr++) flag|=((*ptr>0 && *ptr<32)||(*ptr=='\"')||(*ptr=='\\'))?1:0;
if (!flag) if (!flag)
@ -268,14 +277,6 @@ static char *print_string_ptr(const char *str,printbuffer *p)
return out; return out;
} }
if (!str)
{
if (p) out=ensure(p,3);
else out=(char*)cJSON_malloc(3);
if (!out) return 0;
strcpy(out,"\"\"");
return out;
}
ptr=str;while ((token=*ptr) && ++len) {if (strchr("\"\\\b\f\n\r\t",token)) len++; else if (token<32) len+=5;ptr++;} ptr=str;while ((token=*ptr) && ++len) {if (strchr("\"\\\b\f\n\r\t",token)) len++; else if (token<32) len+=5;ptr++;}
if (p) out=ensure(p,len+3); if (p) out=ensure(p,len+3);