Update json-c to v0.15 (#2328)

SPECS/json-c/CVE-2020-12762.patch

@@ -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 a/arraylist.c b/arraylist.c
-index 12ad8af6d3..e5524aca75 100644
---- a/arraylist.c
-+++ b/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 a/linkhash.c b/linkhash.c
-index 7ea58c0abf..f05cc38030 100644
---- a/linkhash.c
-+++ b/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 a/linkhash.c b/linkhash.c
-index f05cc38030..51e90b13a2 100644
---- a/linkhash.c
-+++ b/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 a/printbuf.c b/printbuf.c
-index 976c12dde5..00822fac4f 100644
---- a/printbuf.c
-+++ b/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)
- 	{

SPECS/json-c/json-c.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "json-c-json-c-0.14-20200419.tar.gz": "ec4eb70e0f6c0d707b9b1ec646cf7c860f4abb3562a90ea6e4d78d177fd95303"
+  "json-c-0.15.tar.gz": "4ba9a090a42cf1e12b84c64e4464bb6fb893666841d5843cc5bef90774028882"
  }
 }

SPECS/json-c/json-c.spec

@@ -1,16 +1,15 @@
+%global publishdate 20200726
+
 Summary:        A JSON implementation in C
 Name:           json-c
-Version:        0.14
-Release:        3%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Base
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/json-c/json-c
-#Source0:       %{url}/archive/%{name}-%{version}-20200419.tar.gz
-Source0:        %{name}-%{name}-%{version}-20200419.tar.gz
-Patch0:         CVE-2020-12762.patch
-Patch1:         Fix-CVE-2020-12762.patch
+Source0:        %{url}/archive/%{name}-%{version}-%{publishdate}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires: cmake
 
@@ -26,9 +25,7 @@ The package contains libraries and header files for
 developing applications that use json-c.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}-20200419
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-%{name}-%{version}-%{publishdate}
 
 %build
 mkdir build
@@ -52,6 +49,7 @@ make %{?_smp_mflags} test
 %defattr(-,root,root)
 %license COPYING
 %{_libdir}/lib%{name}.so.*
+%exclude %{_libdir}/libjson-c.a
 
 %files devel
 %defattr(-,root,root)
@@ -60,24 +58,37 @@ make %{?_smp_mflags} test
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
-*   Thu Nov 19 2020 Andrew Phelps <anphel@microsoft.com> 0.14-3
--   Fix check tests
-*   Tue Aug 04 2020 Henry Beberman <henry.beberman@microsoft.com> 0.14-2
--   Add a patch to fix a bug introduced by CVE-2020-12762.patch
-*   Mon Jun 08 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 0.14-1
--   Bumping up version and adding a patch to fix CVE-2020-12762.
--   License verified.
--   Removing "sha1" macro.
--   Updated "Source0" tag to use the sources from project's main page instead of Amazon's AWS.
-*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 0.13.1-3
--   Added %%license line automatically
-*   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.13.1-2
--   Initial CBL-Mariner import from Photon (license: Apache2).
-*   Wed Oct 10 2018 Ankit Jain <ankitja@vmware.com> 0.13.1-1
--   Updated package to version 0.13.1
-*   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 0.12.1-1
--   Updated package to version 0.12.1
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.12-2
--   GA - Bump release of all rpms
-*   Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 0.12-1
--   Initial build. First version
+* Thu Feb 24 2022 Cameron Baird <cameronbaird@microsoft.com> - 0.15-1
+- Update source to v0.15
+- Remove CVE-2020-12762.patch, Fix-CVE-2020-12762.patch (found in release source)
+- Exclude static library 
+
+* Thu Nov 19 2020 Andrew Phelps <anphel@microsoft.com> - 0.14-3
+- Fix check tests
+
+* Tue Aug 04 2020 Henry Beberman <henry.beberman@microsoft.com> - 0.14-2
+- Add a patch to fix a bug introduced by CVE-2020-12762.patch
+
+* Mon Jun 08 2020 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.14-1
+- Bumping up version and adding a patch to fix CVE-2020-12762.
+- License verified.
+- Removing "sha1" macro.
+- Updated "Source0" tag to use the sources from project's main page instead of Amazon's AWS.
+
+* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 0.13.1-3
+- Added %%license line automatically
+
+* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 0.13.1-2
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Wed Oct 10 2018 Ankit Jain <ankitja@vmware.com> - 0.13.1-1
+- Updated package to version 0.13.1
+
+* Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> - 0.12.1-1
+- Updated package to version 0.12.1
+
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 0.12-2
+- GA - Bump release of all rpms
+
+* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> - 0.12-1
+- Initial build. First version

cgmanifest.json

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