utils/jq/patches/002-heap-buffer-overflow.patch

   1 From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
   2 From: Nicolas Williams <nico@cryptonector.com>
   3 Date: Sat, 24 Oct 2015 17:24:57 -0500
   4 Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105)
   5
   6 This was an off-by one: the NUL terminator byte was not allocated on
   7 resize.  This was triggered by JSON-encoded numbers longer than 256
   8 bytes.
   9 ---
  10  src/jv_parse.c | 4 ++--
  11  1 file changed, 2 insertions(+), 2 deletions(-)
  12
  13 diff --git a/src/jv_parse.c b/src/jv_parse.c
  14 index 3102ed4..84245b8 100644
  15 --- src/jv_parse.c
  16 +++ src/jv_parse.c
  17 @@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) {
  18
  19  static void tokenadd(struct jv_parser* p, char c) {
  20    assert(p->tokenpos <= p->tokenlen);
  21 -  if (p->tokenpos == p->tokenlen) {
  22 +  if (p->tokenpos >= (p->tokenlen - 1)) {
  23      p->tokenlen = p->tokenlen*2 + 256;
  24      p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen);
  25    }
  26 @@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) {
  27      TRY(value(p, v));
  28    } else {
  29      // FIXME: better parser
  30 -    p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
  31 +    p->tokenbuf[p->tokenpos] = 0;
  32      char* end = 0;
  33      double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end);
  34      if (end == 0 || *end != 0)