shithub: riscv

Info  •  Files  •  Log  •  Branches

merge in master

--- a/sys/src/libjson/json.c

+++ b/sys/src/libjson/json.c

@@ -323,7 +323,7 @@

 	memset(&l, 0, sizeof(l));

 	l.s = 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;

 	j = jsonobj(&l);

@@ -336,6 +336,8 @@

 {

 	JSONEl *e, *f;

+	if(j == nil)

+		return;

 	switch(j->t){

 	case JSONString:

 		if(j->s)