开源软件构建与测试

Changes of Revision 2

_service:extract_file:json-c.spec Deleted

@@ -1,142 +0,0 @@
-%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-%global so_ver      5
-%global reldate     20200726
-
-
-Name:           json-c
-Version:        0.15
-Release:        5
-Summary:        JSON implementation in C
-
-License:        MIT
-URL:            https://github.com/%{name}/%{name}
-Source0:        %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz
-
-BuildRequires:  cmake gcc ninja-build
-
-%description
-JSON-C implements a reference counting object model that allows you
-to easily construct JSON objects in C, output them as JSON formatted
-strings and parse JSON formatted strings back into the C representation
-of JSON objects.  It aims to conform to RFC 7159.
-
-
-%package        devel
-Summary:        Development files for %{name}
-
-Requires:       %{name}%{?_isa} == %{version}-%{release}
-
-Patch6001:      backport-json-escape-str-avoid-harmless-unsigned-integer-overflow.patch
-
-%description    devel
-This package contains libraries and header files for
-developing applications that use %{name}.
-
-%package        help
-Summary:        Reference manual for json-c
-
-BuildArch:      noarch
-
-BuildRequires:  doxygen hardlink
-Provides:       %{name}-doc = %{version}-%{release} 
-Obsoletes:      %{name}-doc = %{version}-%{release}
-
-%description    help
-This package contains the reference manual for %{name}.
-
-%prep
-%autosetup -n %{name}-%{name}-%{version}-%{reldate} -p 1
- 
-# Remove pre-built html documentation.
-rm -fr doc/html
- 
-# Update Doxyfile.
-doxygen -s -u doc/Doxyfile.in
- 
- 
-%build
-%cmake \
-  -DBUILD_STATIC_LIBS:BOOL=OFF       \
-  -DCMAKE_BUILD_TYPE:STRING=RELEASE  \
-  -DCMAKE_C_FLAGS_RELEASE:STRING=""  \
-  -DDISABLE_BSYMBOLIC:BOOL=OFF       \
-  -DDISABLE_WERROR:BOOL=ON           \
-  -DENABLE_RDRAND:BOOL=ON            \
-  -DENABLE_THREADING:BOOL=ON         \
-  -G Ninja\
-  %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \
-  %{!?__cmake_in_source_build:-B "%{_vpath_builddir}"} \
-
-%__cmake --build "%{_vpath_builddir}" %{?_smp_mflags} --verbose --target all doc
-#%cmake_build
-
-%check
-%ninja_test -C %{_vpath_builddir} 
-
-%install
-#%cmake_install
-DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}"
-
-
-mkdir -p %{buildroot}%{_pkgdocdir}
-hardlink -cfv %{buildroot}%{_pkgdocdir}
-
-%pretrans devel -p <lua>
-path = "%{_includedir}/%{name}"
-st = posix.stat(path)
-if st and st.type == "link" then
-  os.remove(path)
-end
-
-%ldconfig_scriptlets
-
-%files
-%license AUTHORS COPYING
-%{_libdir}/lib%{name}.so.%{so_ver}*
-
-%files devel
-%{_includedir}/%{name}
-%{_libdir}/cmake/%{name}
-%{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/%{name}.pc
-
-%files help
-%doc %{_pkgdocdir}
-
-%changelog
-* Tue May 24 2022 fengtao <fengtao40@huawei.com> - 0.15-5
-- we got upgrade error when upgrade json-c from very low version,
-  for example json-c-0.11-5. because old version has a softlink:
-  /usr/include/json-c  --> /usr/include/json
-  and now, softlink has been removed. so, we fix this in pretrans
-
-* Fri May 6 2022 wuchaochao <cyanrose@yeah.net> - 0.15-4
-- add   backport-json-escape-str-avoid-harmless-unsigned-integer-overflow.patch
-
-* Thu Apr 7 2022 wuchaochao <cyanrose@yeah.net> - 0.15-3
-- add check
-
-* Fri Mar 25 2022 wuchaochao <cyanrose@yeah.net> - 0.15-2
-- move json-c
-
-* Tue Sep 14 2021 hanhui <hanhui15@huawei.com> - 0.15-1
-- update to 0.15
-
-* Thu Sep 9 2021 liuyumeng <liuyumeng5@huawei.com> - 0.13.1-9
-- fix broken RDRAND causes infinite looping
-
-* Tue Jul 21 2020 wangye <wangye70@huawei.com> - 0.13.1-8
-- fix hardlink path
-
-* Fri May 22 2020 ruanweidong <ruanweidong1@huawei.com> -0.13.1-7
-- fix CVE-2020-12762
-
-* Sat Mar 21 2020 songnannan <songnannan2@huawei.com> - 0.13.1-6
-- delete the check
-
-* Tue Mar 3 2020 songnannan<songnannan2@huawei.com> - 0.13.1-5
-- bugfix in oss-fuzz
-
-* Thu Sep 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.13.1-4
-- Package init

_service:tar_scm:json-c.spec Added

@@ -0,0 +1,150 @@
+%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
+%global so_ver      5
+%global reldate     20220414
+
+
+Name:           json-c
+Version:        0.16
+Release:        2
+Summary:        JSON implementation in C
+
+License:        MIT
+URL:            https://github.com/%{name}/%{name}
+Source0:        %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz
+
+BuildRequires:  cmake gcc ninja-build
+
+Patch6001:      backport-Add-test-to-check-for-the-memory-leak-mentioned-in-issue-781.patch
+Patch6002:      backport-Fix-memory-leak-with-emtpy-strings-in-json_object_set_string.patch
+Patch6003:      backport-json_object_from_fd_ex-fail-if-file-is-too-large.patch
+
+%description
+JSON-C implements a reference counting object model that allows you
+to easily construct JSON objects in C, output them as JSON formatted
+strings and parse JSON formatted strings back into the C representation
+of JSON objects.  It aims to conform to RFC 7159.
+
+
+%package        devel
+Summary:        Development files for %{name}
+
+Requires:       %{name}%{?_isa} == %{version}-%{release}
+
+%description    devel
+This package contains libraries and header files for
+developing applications that use %{name}.
+
+%package        help
+Summary:        Reference manual for json-c
+
+BuildArch:      noarch
+
+BuildRequires:  doxygen hardlink
+Provides:       %{name}-doc = %{version}-%{release} 
+Obsoletes:      %{name}-doc = %{version}-%{release}
+
+%description    help
+This package contains the reference manual for %{name}.
+
+%prep
+%autosetup -n %{name}-%{name}-%{version}-%{reldate} -p 1
+ 
+# Remove pre-built html documentation.
+rm -fr doc/html
+ 
+# Update Doxyfile.
+doxygen -s -u doc/Doxyfile.in
+ 
+ 
+%build
+%cmake \
+  -DBUILD_STATIC_LIBS:BOOL=OFF       \
+  -DCMAKE_BUILD_TYPE:STRING=RELEASE  \
+  -DCMAKE_C_FLAGS_RELEASE:STRING=""  \
+  -DDISABLE_BSYMBOLIC:BOOL=OFF       \
+  -DDISABLE_WERROR:BOOL=ON           \
+  -DENABLE_RDRAND:BOOL=ON            \
+  -DENABLE_THREADING:BOOL=ON         \
+  -G Ninja\
+  %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \
+  %{!?__cmake_in_source_build:-B "%{_vpath_builddir}"} \
+
+%__cmake --build "%{_vpath_builddir}" %{?_smp_mflags} --verbose --target all doc
+
+%check
+%ninja_test -C %{_vpath_builddir} 
+
+%install
+DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}"
+
+
+mkdir -p %{buildroot}%{_pkgdocdir}
+hardlink -cfv %{buildroot}%{_pkgdocdir}
+
+%pretrans devel -p <lua>
+path = "%{_includedir}/%{name}"
+st = posix.stat(path)
+if st and st.type == "link" then
+  os.remove(path)
+end
+
+%ldconfig_scriptlets
+
+%files
+%license AUTHORS COPYING
+%{_libdir}/lib%{name}.so.%{so_ver}*
+
+%files devel
+%{_includedir}/%{name}
+%{_libdir}/cmake/%{name}
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+%files help
+%doc %{_pkgdocdir}
+
+%changelog
+* Mon Nov 14 2022 mengkanglai <mengkanglai2@huawei.com> - 0.16-2
+- add backport-Add-test-to-check-for-the-memory-leak-mentioned-in-issue-781.patch
+- add backport-Fix-memory-leak-with-emtpy-strings-in-json_object_set_string.patch
+- add backport-json_object_from_fd_ex-fail-if-file-is-too-large.patch
+
+* Sat Nov 5 2022 zhangrui <zhangrui182@huawei.com> - 0.16-1
+- Update to 0.16
+
+* Tue May 24 2022 fengtao <fengtao40@huawei.com> - 0.15-5
+- we got upgrade error when upgrade json-c from very low version,
+  for example json-c-0.11-5. because old version has a softlink:
+  /usr/include/json-c  --> /usr/include/json
+  and now, softlink has been removed. so, we fix this in pretrans
+
+* Fri May 6 2022 wuchaochao <cyanrose@yeah.net> - 0.15-4
+- add   backport-json-escape-str-avoid-harmless-unsigned-integer-overflow.patch
+
+* Thu Apr 7 2022 wuchaochao <cyanrose@yeah.net> - 0.15-3
+- add check
+
+* Fri Mar 25 2022 wuchaochao <cyanrose@yeah.net> - 0.15-2
+- move json-c
+
+* Tue Sep 14 2021 hanhui <hanhui15@huawei.com> - 0.15-1
+- update to 0.15
+
+* Thu Sep 9 2021 liuyumeng <liuyumeng5@huawei.com> - 0.13.1-9
+- fix broken RDRAND causes infinite looping
+
+* Tue Jul 21 2020 wangye <wangye70@huawei.com> - 0.13.1-8
+- fix hardlink path
+
+* Fri May 22 2020 ruanweidong <ruanweidong1@huawei.com> -0.13.1-7
+- fix CVE-2020-12762
+
+* Sat Mar 21 2020 songnannan <songnannan2@huawei.com> - 0.13.1-6
+- delete the check
+
+* Tue Mar 3 2020 songnannan<songnannan2@huawei.com> - 0.13.1-5
+- bugfix in oss-fuzz
+
+* Thu Sep 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.13.1-4
+- Package init

_service:extract_file:backport-json-escape-str-avoid-harmless-unsigned-integer-overflow.patch Deleted

@@ -1,48 +0,0 @@
-From 296db618e9d1862aea788e90e751b4999db41a2a Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 12 Jan 2022 23:43:03 +0100
-Subject: PATCH json_escape_str(): avoid harmless unsigned integer overflow
-
-Current behaviour is perfectly valid, since wrap-over upon overflow is
-well defined behaviour for unsigned types, but it is nevertheless nice to be
-able to build with -fsanitize=undefined,unsigned-integer-overflow
-
-There is no significant effect on the generated assembly as can be seen
-on the diff of objdump -d output on a optimized build (the compiler
-just decided to switch the order of a comparison):
-
-@@ -135,8 +135,8 @@
-  1d0:  0f 84 70 ff ff ff       je     146 <json_escape_str+0x146>
-  1d6:  4c 3b 24 24             cmp    (%rsp),%r12
-  1da:  0f 85 2d ff ff ff       jne    10d <json_escape_str+0x10d>
-- 1e0:  49 39 f4                cmp    %rsi,%r12
-- 1e3:  0f 87 b7 00 00 00       ja     2a0 <json_escape_str+0x2a0>
-+ 1e0:  4c 39 e6                cmp    %r12,%rsi
-+ 1e3:  0f 82 b7 00 00 00       jb     2a0 <json_escape_str+0x2a0>
-  1e9:  48 8b 44 24 18          mov    0x18(%rsp),%rax
-  1ee:  64 48 33 04 25 28 00    xor    %fs:0x28,%rax
-  1f5:  00 00
-
-Conflict:NA
-Reference:https://github.com/json-c/json-c/commit/296db618e9d1862aea788e90e751b4999db41a2a
----
- json_object.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/json_object.c b/json_object.c
-index 9198257..3216941 100644
---- a/json_object.c
-+++ b/json_object.c
-@@ -216,8 +216,9 @@ static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int
- {
- 	int pos = 0, start_offset = 0;
- 	unsigned char c;
--	while (len--)
-+	while (len)
- 	{
-+		--len;
- 		c = strpos;
- 		switch (c)
- 		{
--- 
-2.27.0
\ No newline at end of file

_service:tar_scm:backport-Add-test-to-check-for-the-memory-leak-mentioned-in-issue-781.patch Added

@@ -0,0 +1,31 @@
+From 16208fc01afcd742fd5e6736f52849ad2ec03e8f Mon Sep 17 00:00:00 2001
+From: Eric Haszlakiewicz <erh+git@nimenees.com>
+Date: Sun, 24 Jul 2022 18:59:26 +0000
+Subject: PATCH Add test to check for the memory leak mentioned in issue #781
+
+Conflict:NA
+Reference:https://github.com/json-c/json-c/commit/16208fc01afcd742fd5e6736f52849ad2ec03e8f
+
+---
+ tests/test_set_value.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/tests/test_set_value.c b/tests/test_set_value.c
+index f51a2a5b67..a8ebbfec79 100644
+--- a/tests/test_set_value.c
++++ b/tests/test_set_value.c
+@@ -71,6 +71,14 @@ int main(int argc, char **argv)
+ 	json_object_set_string(tmp, SHORT);
+ 	assert(strcmp(json_object_get_string(tmp), SHORT) == 0);
+ 	assert(strcmp(json_object_to_json_string(tmp), "\"" SHORT "\"") == 0);
++
++	// Set an empty string a couple times to try to trigger
++	// a case that used to leak memory.
++	json_object_set_string(tmp, "");
++	json_object_set_string(tmp, HUGE);
++	json_object_set_string(tmp, "");
++	json_object_set_string(tmp, HUGE);
++
+ 	json_object_put(tmp);
+ 	printf("STRING PASSED\n");
+

_service:tar_scm:backport-Fix-memory-leak-with-emtpy-strings-in-json_object_set_string.patch Added

@@ -0,0 +1,67 @@
+From 213bb5caa11ed2182848d86c86f8e9ab4c75642a Mon Sep 17 00:00:00 2001
+From: Daniel Danzberger <daniel@dd-wrt.com>
+Date: Sun, 24 Jul 2022 18:46:03 +0200
+Subject: PATCH Fix memory leak with emtpy strings in json_object_set_string
+
+When a json string object is updated with a bigger string, a new
+malloc'ed buffer is used to store the new string and it's size is made
+negative to indicate that an external buffer is in use.
+
+When that same json string object get's updated again with an empty
+stirng (size = 0), the new external malloc'ed buffer is still used.
+But the fact that the new size value is not negative removes the
+indicator that the externally malloc'ed buffer is used.
+
+This becomes a problem when the object get's updated again with any
+other string, because a new buffer will be malloced and linked to the
+object while to old one won't be free'd.
+
+This causes a memory leak when updating a json string with
+json_object_set_stirng() which has previously been updated
+with an empty string.
+
+Example:
+--
+obj = json_object_new_string("data");
+json_object_set_string(obj, "more data");
+json_object_set_string(obj, "");
+json_object_set_string(obj, "other data"); /* leaks */
+--
+
+This commit fixes the issue by free'ing the external buffer when an
+empty string is set and use the internal one again.
+
+Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
+
+Conflict:NA
+Reference:https://github.com/json-c/json-c/commit/213bb5caa11ed2182848d86c86f8e9ab4c75642a
+---
+ json_object.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/json_object.c b/json_object.c
+index e52ca4071a..581b1e2748 100644
+--- a/json_object.c
++++ b/json_object.c
+@@ -1323,11 +1323,18 @@ static int _json_object_set_string_len(json_object *jso, const char *s, size_t l
+ 		// length as int, cap length at INT_MAX.
+ 		return 0;
+ 
+-	dstbuf = get_string_component_mutable(jso);
+ 	curlen = JC_STRING(jso)->len;
+-	if (curlen < 0)
+-		curlen = -curlen;
++	if (curlen < 0) {
++		if (len == 0) {
++			free(JC_STRING(jso)->c_string.pdata);
++			JC_STRING(jso)->len = curlen = 0;
++		} else {
++			curlen = -curlen;
++		}
++	}
++
+ 	newlen = len;
++	dstbuf = get_string_component_mutable(jso);
+ 
+ 	if ((ssize_t)len > curlen)
+ 	{

_service:tar_scm:backport-json_object_from_fd_ex-fail-if-file-is-too-large.patch Added

@@ -0,0 +1,111 @@
+From 5accae04bbc727fd447c2db4c1c541a4142bd4a0 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Sun, 20 Mar 2022 13:17:37 +0100
+Subject: PATCH json_object_from_fd_ex: fail if file is too large
+
+If the input file is too large to fit into a printbuf then return an
+error value instead of silently truncating the parsed content.
+
+This introduces errno handling into printbuf to distinguish between an
+input file being too large and running out of memory.
+
+Conflict:tests/test_util_file.expected,0.16 version has merge.
+Reference:https://github.com/json-c/json-c/commit/5accae04bbc727fd447c2db4c1c541a4142bd4a0
+---
+ json_util.c                   | 13 ++++++++++---
+ printbuf.c                    | 14 +++++++++++++-
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/json_util.c b/json_util.c
+index 3e6a6c681b..e1c05c5cfd 100644
+--- a/json_util.c
++++ b/json_util.c
+@@ -101,15 +101,22 @@ struct json_object *json_object_from_fd_ex(int fd, int in_depth)
+ 	if (!tok)
+ 	{
+ 		_json_c_set_last_err(
+-		    "json_object_from_fd_ex: unable to allocate json_tokener(depth=%d): %s\n", depth,
+-		    strerror(errno));
++		    "json_object_from_fd_ex: unable to allocate json_tokener(depth=%d): %s\n",
++		    depth, strerror(errno));
+ 		printbuf_free(pb);
+ 		return NULL;
+ 	}
+ 
+ 	while ((ret = read(fd, buf, JSON_FILE_BUF_SIZE)) > 0)
+ 	{
+-		printbuf_memappend(pb, buf, ret);
++		if (printbuf_memappend(pb, buf, ret) < 0)
++		{
++			_json_c_set_last_err("json_object_from_fd_ex: error reading fd %d: %s\n",
++			                     fd, strerror(errno));
++			json_tokener_free(tok);
++			printbuf_free(pb);
++			return NULL;
++		}
+ 	}
+ 	if (ret < 0)
+ 	{
+diff --git a/printbuf.c b/printbuf.c
+index a08f7b1582..12d3b3319d 100644
+--- a/printbuf.c
++++ b/printbuf.c
+@@ -15,6 +15,7 @@
+ 
+ #include "config.h"
+ 
++#include <errno.h>
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -56,6 +57,8 @@ struct printbuf *printbuf_new(void)
+  *
+  * If the current size is large enough, nothing is changed.
+  *
++ * If extension failed, errno is set to indicate the error.
++ *
+  * Note: this does not check the available space!  The caller
+  *  is responsible for performing those calculations.
+  */
+@@ -68,7 +71,10 @@ static int printbuf_extend(struct printbuf *p, int min_size)
+ 		return 0;
+ 	/* Prevent signed integer overflows with large buffers. */
+ 	if (min_size > INT_MAX - 8)
++	{
++		errno = EFBIG;
+ 		return -1;
++	}
+ 	if (p->size > INT_MAX / 2)
+ 		new_size = min_size + 8;
+ 	else {
+@@ -77,7 +83,7 @@ static int printbuf_extend(struct printbuf *p, int min_size)
+ 			new_size = min_size + 8;
+ 	}
+ #ifdef PRINTBUF_DEBUG
+-	MC_DEBUG("printbuf_memappend: realloc "
++	MC_DEBUG("printbuf_extend: realloc "
+ 	         "bpos=%d min_size=%d old_size=%d new_size=%d\n",
+ 	         p->bpos, min_size, p->size, new_size);
+ #endif /* PRINTBUF_DEBUG */
+@@ -92,7 +98,10 @@ int printbuf_memappend(struct printbuf *p, const char *buf, int size)
+ {
+ 	/* Prevent signed integer overflows with large buffers. */
+ 	if (size < 0 || size > INT_MAX - p->bpos - 1)
++	{
++		errno = EFBIG;
+ 		return -1;
++	}
+ 	if (p->size <= p->bpos + size + 1)
+ 	{
+ 		if (printbuf_extend(p, p->bpos + size + 1) < 0)
+@@ -112,7 +121,10 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
+ 		offset = pb->bpos;
+ 	/* Prevent signed integer overflows with large buffers. */
+ 	if (len < 0 || offset < -1 || len > INT_MAX - offset)
++	{
++		errno = EFBIG;
+ 		return -1;
++	}
+ 	size_needed = offset + len;
+ 	if (pb->size < size_needed)
+ 	{

_service Changed

_service:extract_file:json-c-0.15-20200726.tar.gz Deleted

_service:extract_file:json-c.yaml Deleted

_service:tar_scm:json-c-0.16-20220414.tar.gz Added

_service:tar_scm:json-c-1653450422.ee525db.tar Deleted

_service:tar_scm:json-c.yaml Added