cJSON: update to 1.7.15.

This commit is contained in:
Evgeny Ermakov 2022-01-13 09:39:42 +11:00 committed by Érico Nogueira Rolim
parent b7de8dc919
commit 1895699d9f
2 changed files with 23 additions and 2 deletions

View File

@ -0,0 +1,21 @@
From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
From: Alan Wang <948467222@qq.com>
Date: Thu, 26 Aug 2021 14:13:42 +0800
Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
---
cJSON_Utils.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/cJSON_Utils.c b/cJSON_Utils.c
index c7c64391..63651dfb 100644
--- a/cJSON_Utils.c
+++ b/cJSON_Utils.c
@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
replacement = merge_patch(replace_me, patch_child, case_sensitive);
if (replacement == NULL)
{
+ cJSON_Delete(target);
return NULL;
}

View File

@ -1,6 +1,6 @@
# Template file for 'cJSON' # Template file for 'cJSON'
pkgname=cJSON pkgname=cJSON
version=1.7.14 version=1.7.15
revision=1 revision=1
build_style=cmake build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C" short_desc="Ultralightweight JSON parser in ANSI C"
@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT" license="MIT"
homepage="https://github.com/DaveGamble/cJSON" homepage="https://github.com/DaveGamble/cJSON"
distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz" distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
checksum=fb50a663eefdc76bafa80c82bc045af13b1363e8f45cec8b442007aef6a41343 checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE