From a8e8b650f3643c1a9f434fb2efb4708ff53539cd Mon Sep 17 00:00:00 2001 From: BurnZeZ Date: Mon, 28 Oct 2013 23:21:07 -0400 Subject: libjson: dynamically allocate buffer --- sys/src/libjson/json.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'sys/src/libjson/json.c') diff --git a/sys/src/libjson/json.c b/sys/src/libjson/json.c index 1056ac5d0..1cf77be3b 100644 --- a/sys/src/libjson/json.c +++ b/sys/src/libjson/json.c @@ -17,9 +17,10 @@ enum { struct Lex { char *s; + ulong slen; int t; double n; - char buf[4096]; + char *buf; Rune peeked; jmp_buf jmp; int canjmp; @@ -96,7 +97,7 @@ lex(Lex *l) t = l->buf; for(;;){ t += runetochar(t, &r); - if(t >= l->buf + sizeof(l->buf)){ + if(t >= l->buf + l->slen){ werrstr("json: literal too long"); return -1; } @@ -181,7 +182,7 @@ lex(Lex *l) } r2 = 0; t += runetochar(t, &r); - if(t >= l->buf + sizeof(l->buf)){ + if(t >= l->buf + l->slen){ werrstr("json: string too long"); return -1; } @@ -201,7 +202,11 @@ jsonobj(Lex *l) JSONEl *e; JSONEl **ln; int obj; - + + l->buf = mallocz(l->slen, 1); + if(l->buf == nil) + return nil; + j = mallocz(sizeof(*j), 1); if(j == nil) return nil; @@ -319,6 +324,7 @@ jsonparse(char *s) memset(&l, 0, sizeof(l)); l.s = s; + l.slen = strlen(s)+1; return jsonobj(&l); } -- cgit v1.2.3