json-c: update to 0.16, adopt

This commit is contained in:
skmpz 2022-06-17 22:04:39 +04:00 committed by Duncan Overbruck
parent 587da0a026
commit ff46e9e1cb
2 changed files with 4 additions and 27 deletions

View File

@ -1,24 +0,0 @@
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,

View File

@ -1,17 +1,18 @@
# Template file for 'json-c'
pkgname=json-c
version=0.15
version=0.16
revision=1
build_style=cmake
configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
-DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"
hostmakedepends="doxygen"
short_desc="JSON implementation in C"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://json-c.github.io/json-c"
changelog="https://raw.githubusercontent.com/json-c/json-c/master/ChangeLog"
distfiles="https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${version}.tar.gz"
checksum=b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
checksum=8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b
CFLAGS="-Wno-error"