Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
57eac98acf | ||
|
ccf94094f6 | ||
|
2b3e078cd8 | ||
|
6d565de8ba | ||
|
f7e334cc31 | ||
|
9d7555ec18 | ||
|
2f934f74c1 | ||
|
e9f16869e5 |
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,12 +1,14 @@
|
|||||||
Name: jq
|
Name: jq
|
||||||
Version: 1.5
|
Version: 1.5
|
||||||
Release: 6%{?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: flex
|
BuildRequires: flex
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: oniguruma-devel
|
BuildRequires: oniguruma-devel
|
||||||
@ -42,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
|
||||||
@ -70,9 +73,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||||||
make check
|
make check
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
@ -90,6 +91,27 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Apr 01 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.5-12
|
||||||
|
- Rebuild against oniguruma 6.8.1
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Lon Hohberger <lon@fedoraproject.org> - 1.5-10
|
||||||
|
- Fix CVE 2015-8863
|
||||||
|
|
||||||
|
* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5-9
|
||||||
|
- Switch to %%ldconfig_scriptlets
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-6
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user