diff options
author | Nicolas Williams <nico@cryptonector.com> | 2015-10-24 17:24:57 -0500 |
---|---|---|
committer | Nicolas Williams <nico@cryptonector.com> | 2015-10-24 17:27:56 -0500 |
commit | 8eb1367ca44e772963e704a700ef72ae2e12babd (patch) | |
tree | 3d9a25a0d68eecd1ddac763a04f92dcc21d84655 /src/jv_parse.c | |
parent | 2f79004f856532c479b79e226798a3dcc0a127f0 (diff) |
Heap buffer overflow in tokenadd() (fix #105)
This was an off-by one: the NUL terminator byte was not allocated on
resize. This was triggered by JSON-encoded numbers longer than 256
bytes.
Diffstat (limited to 'src/jv_parse.c')
-rw-r--r-- | src/jv_parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jv_parse.c b/src/jv_parse.c index 3102ed4f..84245b86 100644 --- a/src/jv_parse.c +++ b/src/jv_parse.c @@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) { static void tokenadd(struct jv_parser* p, char c) { assert(p->tokenpos <= p->tokenlen); - if (p->tokenpos == p->tokenlen) { + if (p->tokenpos >= (p->tokenlen - 1)) { p->tokenlen = p->tokenlen*2 + 256; p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen); } @@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) { TRY(value(p, v)); } else { // FIXME: better parser - p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid + p->tokenbuf[p->tokenpos] = 0; char* end = 0; double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end); if (end == 0 || *end != 0) |