rpms/json-c
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch fixing invalid free in some cases

Browse Source
This commit is contained in:
Björn Esser 2017-12-13 20:36:53 +01:00
parent b89190535a
commit 9c657adefe
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
json-c-0.13_json_object_avoid_invalid_free.patch Normal file
View File

@ -0,0 +1,26 @@
From 1c1c14271eadeb35dc2fb38e199bde2e90ff4ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 13 Dec 2017 19:22:52 +0100
Subject: [PATCH] json_object: Avoid double free (and thus a segfault) when
ref_count gets < 0
---
json_object.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/json_object.c b/json_object.c
index 042477a71b..b94b9e222a 100644
--- a/json_object.c
+++ b/json_object.c
@@ -189,9 +189,9 @@ int json_object_put(struct json_object *jso)
* as that can result in the thread that loses the race to 0
* operating on an already-freed object.
*/
- if (__sync_sub_and_fetch(&jso->_ref_count, 1) > 0) return 0;
+ if (__sync_sub_and_fetch(&jso->_ref_count, 1) != 0) return 0;
#else
- if (--jso->_ref_count > 0) return 0;
+ if (--jso->_ref_count != 0) return 0;
#endif
if (jso->_user_delete)

6
json-c.spec
View File

@ -16,7 +16,7 @@
Name: json-c
Version: 0.13
Release: 3%{?dist}
Release: 4%{?dist}
Summary: JSON implementation in C
License: MIT
@ -30,6 +30,7 @@ Source1: %{url}/archive/%{name}-%{version_old}-%{reldate_old}.tar.gz
Patch0: %{url}/pull/386.patch#/%{name}-0.13_Makefile_add_aclocal_amflags.patch
Patch1: %{url}/commit/94fd101601c24627ae44498a7a73e9f2d9fb6e91.patch#/%{name}-0.13_json_object_add_size_t_json_c_object_sizeof_1.patch
Patch2: %{url}/commit/5b6d62259afbc1709d4437b8c488de429079cae0.patch#/%{name}-0.13_json_object_add_size_t_json_c_object_sizeof_2.patch
Patch3: %{url}/pull/389.patch#/json-c-0.13_json_object_avoid_invalid_free.patch
BuildRequires: libtool
@ -175,6 +176,9 @@ end
%changelog
* Wed Dec 13 2017 Björn Esser <besser82@fedoraproject.org> - 0.13-4
- Add upstream patch fixing invalid free in some cases
* Wed Dec 13 2017 Björn Esser <besser82@fedoraproject.org> - 0.13-3
- Add upstream patch for adding size_t json_c_object_sizeof()
- Enable partial multi-threaded support