xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge in master

Browse source
This commit is contained in:
ben 2016-04-27 08:20:54 -05:00
commit 86e0099835
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/src/libjson/json.c
View file

@ -323,7 +323,7 @@ jsonparse(char *s)
memset(&l, 0, sizeof(l)); memset(&l, 0, sizeof(l));
l.s = s; l.s = s;
l.slen = strlen(s); l.slen = strlen(s);
if((l.buf = mallocz(l.slen+1, 1)) == nil) if((l.buf = mallocz(l.slen+UTFmax+1, 1)) == nil)
return nil; return nil;
j = jsonobj(&l); j = jsonobj(&l);
@ -336,6 +336,8 @@ jsonfree(JSON *j)
{ {
JSONEl *e, *f; JSONEl *e, *f;
if(j == nil)
return;
switch(j->t){ switch(j->t){
case JSONString: case JSONString:
if(j->s) if(j->s)