fix up CVE-2016-4074
This commit is contained in:
parent
6f4c643e22
commit
8ff4e424cc
40
CVE-2016-4074.patch
Normal file
40
CVE-2016-4074.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
From 83e2cf607f3599d208b6b3129092fa7deb2e5292 Mon Sep 17 00:00:00 2001
|
||||||
|
From: W-Mark Kubacki <wmark@hurrikane.de>
|
||||||
|
Date: Fri, 19 Aug 2016 19:50:39 +0200
|
||||||
|
Subject: [PATCH] Skip printing what's below a MAX_PRINT_DEPTH
|
||||||
|
|
||||||
|
This addresses #1136, and mitigates a stack exhaustion when printing
|
||||||
|
a very deeply nested term.
|
||||||
|
---
|
||||||
|
src/jv_print.c | 8 +++++++-
|
||||||
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/jv_print.c b/src/jv_print.c
|
||||||
|
index 5f4f234..ce4a59a 100644
|
||||||
|
--- a/src/jv_print.c
|
||||||
|
+++ b/src/jv_print.c
|
||||||
|
@@ -13,6 +13,10 @@
|
||||||
|
#include "jv_dtoa.h"
|
||||||
|
#include "jv_unicode.h"
|
||||||
|
|
||||||
|
+#ifndef MAX_PRINT_DEPTH
|
||||||
|
+#define MAX_PRINT_DEPTH (256)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#define ESC "\033"
|
||||||
|
#define COL(c) (ESC "[" c "m")
|
||||||
|
#define COLRESET (ESC "[0m")
|
||||||
|
@@ -150,7 +154,9 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- switch (jv_get_kind(x)) {
|
||||||
|
+ if (indent > MAX_PRINT_DEPTH) {
|
||||||
|
+ put_str("<skipped: too deep>", F, S, flags & JV_PRINT_ISATTY);
|
||||||
|
+ } else switch (jv_get_kind(x)) {
|
||||||
|
default:
|
||||||
|
case JV_KIND_INVALID:
|
||||||
|
if (flags & JV_PRINT_INVALID) {
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
6
jq.spec
6
jq.spec
@ -1,11 +1,12 @@
|
|||||||
Name: jq
|
Name: jq
|
||||||
Version: 1.5
|
Version: 1.5
|
||||||
Release: 15
|
Release: 16
|
||||||
Summary: A lightweight and flexible command-line JSON processor
|
Summary: A lightweight and flexible 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/jq-%{version}/jq-%{version}.tar.gz
|
Source0: https://github.com/stedolan/jq/releases/download/jq-%{version}/jq-%{version}.tar.gz
|
||||||
Patch0: CVE-2015-8863.patch
|
Patch0: CVE-2015-8863.patch
|
||||||
|
Patch1: CVE-2016-4074.patch
|
||||||
BuildRequires: flex bison valgrind
|
BuildRequires: flex bison valgrind
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -68,6 +69,9 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 17 2020 likexin <likexin4@huawei.com> -1.5-16
|
||||||
|
- fix up cve-2016-4074
|
||||||
|
|
||||||
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.5-15
|
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.5-15
|
||||||
- Delete unndeeded build requires
|
- Delete unndeeded build requires
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user