[PR PATCH] cJSON: update to 1.7.15.

[PR PATCH] cJSON: update to 1.7.15.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

There is a new pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/cJSON
https://github.com/void-linux/void-packages/pull/35020

cJSON: update to 1.7.15.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl


A patch file from https://github.com/void-linux/void-packages/pull/35020.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/cJSON-35020.patch --]
[-- Type: text/x-diff, Size: 1013 bytes --]

From ef1838d88fb492b9d42e67795eacc0623c47ea04 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 09:39:42 +1100
Subject: [PATCH] cJSON: update to 1.7.15.

---
 srcpkgs/cJSON/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

Re: cJSON: update to 1.7.15.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35020#issuecomment-1011672715

Comment:
I think we should backport https://github.com/DaveGamble/cJSON/commit/f50dafc7d0bfd4f45449ab5665bfea831a82f2eb as well.

Re: [PR PATCH] [Updated] cJSON: update to 1.7.15.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

There is an updated pull request by unspecd against master on the void-packages repository

https://github.com/unspecd/void-packages pkg/cJSON
https://github.com/void-linux/void-packages/pull/35020

cJSON: update to 1.7.15.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl


A patch file from https://github.com/void-linux/void-packages/pull/35020.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/cJSON-35020.patch --]
[-- Type: text/x-diff, Size: 2141 bytes --]

From 4cbcb5c2b3268f16598d8c1ec61bcc55b23b9fe4 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 09:39:42 +1100
Subject: [PATCH] cJSON: update to 1.7.15.

---
 srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 +++++++++++++++++++++
 srcpkgs/cJSON/template                      |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch

diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
new file mode 100644
index 000000000000..01556a6eb8e0
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-memory-leak.patch
@@ -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;
+             }
+ 
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index e4ad38673e14..a3f6914ca7db 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,6 +1,6 @@
 # Template file for 'cJSON'
 pkgname=cJSON
-version=1.7.14
+version=1.7.15
 revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/DaveGamble/cJSON"
 distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=fb50a663eefdc76bafa80c82bc045af13b1363e8f45cec8b442007aef6a41343
+checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
 
 post_install() {
 	vlicense LICENSE

Re: cJSON: update to 1.7.15.

[unspecd]

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/35020#issuecomment-1011744659

Comment:
Done.

Re: [PR PATCH] [Merged]: cJSON: update to 1.7.15.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

There's a merged pull request on the void-packages repository

cJSON: update to 1.7.15.
https://github.com/void-linux/void-packages/pull/35020

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ppc64le-musl