Compare commits
No commits in common. "main" and "master" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,2 @@
|
|||||||
/jq-1.3.tar.gz
|
/jq-1.3.tar.gz
|
||||||
/jq-1.5.tar.gz
|
/jq-1.5.tar.gz
|
||||||
/jq-1.6.tar.gz
|
|
||||||
|
37
CVE-2015-8863.patch
Normal file
37
CVE-2015-8863.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
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/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)
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
30
jq.spec
30
jq.spec
@ -1,21 +1,21 @@
|
|||||||
Name: jq
|
Name: jq
|
||||||
Version: 1.6
|
Version: 1.5
|
||||||
Release: 7%{?dist}
|
Release: 13%{?dist}
|
||||||
Summary: Command-line JSON processor
|
Summary: Command-line JSON processor
|
||||||
|
|
||||||
License: MIT and ASL 2.0 and CC-BY and GPLv3
|
License: MIT and ASL 2.0 and CC-BY and GPLv3
|
||||||
URL: http://stedolan.github.io/jq/
|
URL: http://stedolan.github.io/jq/
|
||||||
Source0: https://github.com/stedolan/jq/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/stedolan/jq/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: CVE-2015-8863.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: oniguruma-devel
|
BuildRequires: oniguruma-devel
|
||||||
|
|
||||||
%ifarch %{valgrind_arches}
|
%ifnarch s390
|
||||||
BuildRequires: valgrind
|
BuildRequires: valgrind
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: make
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -44,6 +44,7 @@ Development files for %{name}
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{version}
|
%setup -qn %{name}-%{version}
|
||||||
|
%patch0 -p2 -b .cve-2015-8863
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static
|
%configure --disable-static
|
||||||
@ -90,27 +91,6 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Dec 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6-6
|
|
||||||
- Use correct valgrind_arches macro to check for valgrind.
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Nov 08 2018 David Fetter <david@fetter.org> - 1.6-1
|
|
||||||
- Upstream 1.6.0
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-13
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-13
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user