json-c: package upgrade to 0.17 (#7811)

This commit is contained in:
elainezhao96 2024-02-13 08:32:52 -08:00 коммит произвёл GitHub
Родитель 53d42a32c1
Коммит e9c81245f9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 9 добавлений и 31 удалений

Просмотреть файл

@ -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,

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"json-c-0.15.tar.gz": "4ba9a090a42cf1e12b84c64e4464bb6fb893666841d5843cc5bef90774028882"
"json-c-0.17.tar.gz": "024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb"
}
}

Просмотреть файл

@ -1,16 +1,15 @@
%global publishdate 20200726
%global publishdate 20230812
Summary: A JSON implementation in C
Name: json-c
Version: 0.15
Release: 2%{?dist}
Version: 0.17
Release: 1%{?dist}
License: MIT
Group: System Environment/Base
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://github.com/json-c/json-c
Source0: %{url}/archive/%{name}-%{version}-%{publishdate}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: CVE-2021-32292.patch
BuildRequires: cmake
@ -59,6 +58,9 @@ make %{?_smp_mflags} test
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Mon Feb 12 2024 Elaine Zhao <elainezhao@microsoft.com> - 0.17-1
- Bump version to 0.17
* Mon Aug 28 2023 Henry Beberman <henry.beberman@microsoft.com> - 0.15-2
- Patch CVE-2021-32292

Просмотреть файл

@ -7861,8 +7861,8 @@
"type": "other",
"other": {
"name": "json-c",
"version": "0.15",
"downloadUrl": "https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz"
"version": "0.17",
"downloadUrl": "https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz"
}
}
},