diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-10-06 23:10:05 +0200 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-10-06 23:10:05 +0200 |
commit | 20c6f9396b059af73190a0dee752360498ef8bd8 (patch) | |
tree | 86416b119d81477d2a138890ae53eb7181f591e5 | |
parent | 16f8ceb8e2d24fc6e5dccc926d86c48ad52a8b64 (diff) | |
download | aports-20c6f9396b059af73190a0dee752360498ef8bd8.tar.bz2 aports-20c6f9396b059af73190a0dee752360498ef8bd8.tar.xz |
main/jq: remove unused patches
-rw-r--r-- | main/jq/0001-mktemp-needs-6-or-more-X-s-fix-1000.patch | 30 | ||||
-rw-r--r-- | main/jq/CVE-2015-8863.patch | 34 |
2 files changed, 0 insertions, 64 deletions
diff --git a/main/jq/0001-mktemp-needs-6-or-more-X-s-fix-1000.patch b/main/jq/0001-mktemp-needs-6-or-more-X-s-fix-1000.patch deleted file mode 100644 index 2f2bad5073..0000000000 --- a/main/jq/0001-mktemp-needs-6-or-more-X-s-fix-1000.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b7a219a91dc1094022478dd9bc0f60275367ce25 Mon Sep 17 00:00:00 2001 -From: David Tolnay <dtolnay@gmail.com> -Date: Sat, 24 Oct 2015 11:21:16 -0700 -Subject: [PATCH] mktemp needs 6 or more X's (fix #1000) - -mktemp(1) isn't posix specified, but it's reasonable to use -mktemp(3) to implement it which requires 6 trailing X's in -the format - -Thanks @sthen ---- - tests/setup | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/setup b/tests/setup -index a6bc5f4..d64ba29 100755 ---- a/tests/setup -+++ b/tests/setup -@@ -29,7 +29,7 @@ clean () { - fi - } - trap clean EXIT --d=`mktemp -d -t jqXXXXX || true` -+d=`mktemp -d -t jqXXXXXX || true` - if [ -z "$d" ]; then - echo "Your OS does not support mktemp(1) -d" 1>&2 - exit 1 --- -2.14.1 - diff --git a/main/jq/CVE-2015-8863.patch b/main/jq/CVE-2015-8863.patch deleted file mode 100644 index c146cadd56..0000000000 --- a/main/jq/CVE-2015-8863.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/src/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) |