diff options
author | 2016-04-28 15:03:45 +0200 | |
---|---|---|
committer | 2016-04-29 23:53:47 -0400 | |
commit | 251e0d08bf9303fbbd2ccb66b550def65f609db5 (patch) | |
tree | f0a2ad4e0d63d7c63cda0374a4d417696fc9bdec /app-misc/jq/files | |
parent | net-analyzer/icinga2: better url (diff) | |
download | gentoo-251e0d08bf9303fbbd2ccb66b550def65f609db5.tar.gz gentoo-251e0d08bf9303fbbd2ccb66b550def65f609db5.tar.bz2 gentoo-251e0d08bf9303fbbd2ccb66b550def65f609db5.zip |
app-misc/jq: fix buffer overflow (bug #580606) and other updates
- add upstream metadata
- add arm architecture
- refactor econf args to an array
- move DOCS and PATCHES to their appropriate functions
- replace custom find with prune_libtool_files()
Gentoo-Bug: 580606
Diffstat (limited to 'app-misc/jq/files')
-rw-r--r-- | app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch new file mode 100644 index 000000000000..edb07d8388b5 --- /dev/null +++ b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch @@ -0,0 +1,34 @@ +From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001 +From: Nicolas Williams <nico@cryptonector.com> +Date: Sat, 24 Oct 2015 17:24:57 -0500 +Subject: [PATCH] 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. +--- + src/jv_parse.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/jv_parse.c b/src/jv_parse.c +index 3102ed4..84245b8 100644 +--- a/jv_parse.c ++++ b/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) |