json-c: update to 0.15.
This commit is contained in:
Piraty
parent
379ee7fd43
commit
a3be9e789b
5 changed files with 27 additions and 306 deletions
|
|
@ -0,0 +1,24 @@
|
|||
From 4e9e44e5258dee7654f74948b0dd5da39c28beec Mon Sep 17 00:00:00 2001
|
||||
From: Marc <34656315+MarcT512@users.noreply.github.com>
|
||||
Date: Fri, 7 Aug 2020 10:49:45 +0100
|
||||
Subject: [PATCH] Fix read past end of buffer
|
||||
|
||||
Resolves https://github.com/json-c/json-c/issues/654
|
||||
---
|
||||
apps/json_parse.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/apps/json_parse.c b/apps/json_parse.c
|
||||
index bba4622183..72b31a860a 100644
|
||||
--- a/apps/json_parse.c
|
||||
+++ b/apps/json_parse.c
|
||||
@@ -82,7 +82,8 @@ static int parseit(int fd, int (*callback)(struct json_object *))
|
||||
int parse_end = json_tokener_get_parse_end(tok);
|
||||
if (obj == NULL && jerr != json_tokener_continue)
|
||||
{
|
||||
- char *aterr = &buf[start_pos + parse_end];
|
||||
+ char *aterr = (start_pos + parse_end < sizeof(buf)) ?
|
||||
+ &buf[start_pos + parse_end] : "";
|
||||
fflush(stdout);
|
||||
int fail_offset = total_read - ret + start_pos + parse_end;
|
||||
fprintf(stderr, "Failed at offset %d: %s %c\n", fail_offset,
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
diff --git CMakeLists.txt CMakeLists.txt
|
||||
index ba692ff..fc2edff 100644
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -65,6 +65,7 @@ include(GNUInstallDirs)
|
||||
include(CMakePackageConfigHelpers)
|
||||
|
||||
option(BUILD_SHARED_LIBS "Default to building shared libraries" ON)
|
||||
+option(BUILD_STATIC_LIBS "Default to building static libraries" OFF)
|
||||
|
||||
# Generate a release merge and test it to verify the correctness of republishing the package.
|
||||
ADD_CUSTOM_TARGET(distcheck
|
||||
@@ -383,7 +384,7 @@ add_library(${PROJECT_NAME}
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
VERSION 5.0.0
|
||||
SOVERSION 5)
|
||||
-
|
||||
+list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
|
||||
# If json-c is used as subroject it set to target correct interface -I flags and allow
|
||||
# to build external target without extra include_directories(...)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
@@ -392,7 +393,33 @@ target_include_directories(${PROJECT_NAME}
|
||||
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
|
||||
)
|
||||
|
||||
-install(TARGETS ${PROJECT_NAME}
|
||||
+# Allow to build static and shared libraries at the same time
|
||||
+if (BUILD_STATIC_LIBS)
|
||||
+ set(STATIC_LIB ${PROJECT_NAME}-static)
|
||||
+ add_library(${STATIC_LIB} STATIC
|
||||
+ ${JSON_C_SOURCES}
|
||||
+ ${JSON_C_HEADERS}
|
||||
+ )
|
||||
+
|
||||
+ # rename the static library
|
||||
+ set_target_properties(${STATIC_LIB} PROPERTIES
|
||||
+ OUTPUT_NAME ${PROJECT_NAME}
|
||||
+ )
|
||||
+ list(APPEND CMAKE_TARGETS ${STATIC_LIB})
|
||||
+endif ()
|
||||
+
|
||||
+# Always create new install dirs with 0755 permissions, regardless of umask
|
||||
+set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
|
||||
+ OWNER_READ
|
||||
+ OWNER_WRITE
|
||||
+ OWNER_EXECUTE
|
||||
+ GROUP_READ
|
||||
+ GROUP_EXECUTE
|
||||
+ WORLD_READ
|
||||
+ WORLD_EXECUTE
|
||||
+ )
|
||||
+
|
||||
+install(TARGETS ${CMAKE_TARGETS}
|
||||
EXPORT ${PROJECT_NAME}-targets
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
From 099016b7e8d70a6d5dd814e788bba08d33d48426 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Mon, 4 May 2020 19:41:16 +0200
|
||||
Subject: [PATCH 1/3] Protect array_list_del_idx against size_t overflow.
|
||||
|
||||
If the assignment of stop overflows due to idx and count being
|
||||
larger than SIZE_T_MAX in sum, out of boundary access could happen.
|
||||
|
||||
It takes invalid usage of this function for this to happen, but
|
||||
I decided to add this check so array_list_del_idx is as safe against
|
||||
bad usage as the other arraylist functions.
|
||||
---
|
||||
arraylist.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git arraylist.c arraylist.c
|
||||
index 12ad8af6d3..e5524aca75 100644
|
||||
--- arraylist.c
|
||||
+++ arraylist.c
|
||||
@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
|
||||
{
|
||||
size_t i, stop;
|
||||
|
||||
+ /* Avoid overflow in calculation with large indices. */
|
||||
+ if (idx > SIZE_T_MAX - count)
|
||||
+ return -1;
|
||||
stop = idx + count;
|
||||
if (idx >= arr->length || stop > arr->length)
|
||||
return -1;
|
||||
|
||||
From 77d935b7ae7871a1940cd827e850e6063044ec45 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Mon, 4 May 2020 19:46:45 +0200
|
||||
Subject: [PATCH 2/3] Prevent division by zero in linkhash.
|
||||
|
||||
If a linkhash with a size of zero is created, then modulo operations
|
||||
are prone to division by zero operations.
|
||||
|
||||
Purely protective measure against bad usage.
|
||||
---
|
||||
linkhash.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git linkhash.c linkhash.c
|
||||
index 7ea58c0abf..f05cc38030 100644
|
||||
--- linkhash.c
|
||||
+++ linkhash.c
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include <assert.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
|
||||
int i;
|
||||
struct lh_table *t;
|
||||
|
||||
+ /* Allocate space for elements to avoid divisions by zero. */
|
||||
+ assert(size > 0);
|
||||
t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
|
||||
if (!t)
|
||||
return NULL;
|
||||
|
||||
From d07b91014986900a3a75f306d302e13e005e9d67 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Mon, 4 May 2020 19:47:25 +0200
|
||||
Subject: [PATCH 3/3] Fix integer overflows.
|
||||
|
||||
The data structures linkhash and printbuf are limited to 2 GB in size
|
||||
due to a signed integer being used to track their current size.
|
||||
|
||||
If too much data is added, then size variable can overflow, which is
|
||||
an undefined behaviour in C programming language.
|
||||
|
||||
Assuming that a signed int overflow just leads to a negative value,
|
||||
like it happens on many sytems (Linux i686/amd64 with gcc), then
|
||||
printbuf is vulnerable to an out of boundary write on 64 bit systems.
|
||||
---
|
||||
linkhash.c | 7 +++++--
|
||||
printbuf.c | 19 ++++++++++++++++---
|
||||
2 files changed, 21 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git linkhash.c linkhash.c
|
||||
index f05cc38030..51e90b13a2 100644
|
||||
--- linkhash.c
|
||||
+++ linkhash.c
|
||||
@@ -580,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
|
||||
{
|
||||
unsigned long n;
|
||||
|
||||
- if (t->count >= t->size * LH_LOAD_FACTOR)
|
||||
- if (lh_table_resize(t, t->size * 2) != 0)
|
||||
+ if (t->count >= t->size * LH_LOAD_FACTOR) {
|
||||
+ /* Avoid signed integer overflow with large tables. */
|
||||
+ int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
|
||||
+ if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
|
||||
return -1;
|
||||
+ }
|
||||
|
||||
n = h % t->size;
|
||||
|
||||
diff --git printbuf.c printbuf.c
|
||||
index 976c12dde5..00822fac4f 100644
|
||||
--- printbuf.c
|
||||
+++ printbuf.c
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
|
||||
|
||||
if (p->size >= min_size)
|
||||
return 0;
|
||||
-
|
||||
- new_size = p->size * 2;
|
||||
- if (new_size < min_size + 8)
|
||||
+ /* Prevent signed integer overflows with large buffers. */
|
||||
+ if (min_size > INT_MAX - 8)
|
||||
+ return -1;
|
||||
+ if (p->size > INT_MAX / 2)
|
||||
new_size = min_size + 8;
|
||||
+ else {
|
||||
+ new_size = p->size * 2;
|
||||
+ if (new_size < min_size + 8)
|
||||
+ new_size = min_size + 8;
|
||||
+ }
|
||||
#ifdef PRINTBUF_DEBUG
|
||||
MC_DEBUG("printbuf_memappend: realloc "
|
||||
"bpos=%d min_size=%d old_size=%d new_size=%d\n",
|
||||
@@ -83,6 +90,9 @@ static int printbuf_extend(struct printbuf *p, int min_size)
|
||||
|
||||
int printbuf_memappend(struct printbuf *p, const char *buf, int size)
|
||||
{
|
||||
+ /* Prevent signed integer overflows with large buffers. */
|
||||
+ if (size > INT_MAX - p->bpos - 1)
|
||||
+ return -1;
|
||||
if (p->size <= p->bpos + size + 1)
|
||||
{
|
||||
if (printbuf_extend(p, p->bpos + size + 1) < 0)
|
||||
@@ -100,6 +110,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
|
||||
|
||||
if (offset == -1)
|
||||
offset = pb->bpos;
|
||||
+ /* Prevent signed integer overflows with large buffers. */
|
||||
+ if (len > INT_MAX - offset)
|
||||
+ return -1;
|
||||
size_needed = offset + len;
|
||||
if (pb->size < size_needed)
|
||||
{
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'json-c'
|
||||
pkgname=json-c
|
||||
version=0.14
|
||||
version=0.15
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
|
||||
|
|
@ -11,7 +11,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="MIT"
|
||||
homepage="https://json-c.github.io/json-c"
|
||||
distfiles="https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${version}.tar.gz"
|
||||
checksum=b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870
|
||||
checksum=b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
|
||||
patch_args="-Np1"
|
||||
|
||||
CFLAGS="-Wno-error"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue