Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cJSON: update to 1.7.13.
@ 2020-04-11 13:37 daniel-eys
  2020-04-12  8:08 ` [PR PATCH] [Merged]: " xtraeme
  0 siblings, 1 reply; 2+ messages in thread
From: daniel-eys @ 2020-04-11 13:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/daniel-eys/void-packages cJSON
https://github.com/void-linux/void-packages/pull/20877

cJSON: update to 1.7.13.
Memory leak patch was picked from upstream, so now included in 1.7.13.

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

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

From 13cc8328870c6b982b59ae1185d2a9deaed2be91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 11 Apr 2020 14:16:21 +0200
Subject: [PATCH] cJSON: update to 1.7.13.

---
 .../cJSON/patches/0001-fix-memory-leak.patch  | 24 -------------------
 srcpkgs/cJSON/template                        |  6 ++---
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/cJSON/patches/0001-fix-memory-leak.patch

diff --git a/srcpkgs/cJSON/patches/0001-fix-memory-leak.patch b/srcpkgs/cJSON/patches/0001-fix-memory-leak.patch
deleted file mode 100644
index e24ccff3203..00000000000
--- a/srcpkgs/cJSON/patches/0001-fix-memory-leak.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7b65bd348da0411f2d6db12f21f7562e7286416c Mon Sep 17 00:00:00 2001
-From: Alanscut <wp_scut@163.com>
-Date: Thu, 5 Dec 2019 11:05:07 +0800
-Subject: [PATCH] fix memory leak mentioned in issue 414
-
----
- cJSON_Utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git cJSON_Utils.c cJSON_Utils.c
-index 7df4db2..b890d17 100644
---- cJSON_Utils.c
-+++ cJSON_Utils.c
-@@ -216,6 +216,7 @@ CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(const cJSON * const obje
-                 if (child_index > ULONG_MAX)
-                 {
-                     cJSON_free(target_pointer);
-+                    cJSON_free(full_pointer);
-                     return NULL;
-                 }
-                 sprintf((char*)full_pointer, "/%lu%s", (unsigned long)child_index, target_pointer); /* /<array_index><path> */
--- 
-2.24.0
-
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index f8f7e9024ac..c8ababeff8b 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,14 +1,14 @@
 # Template file for 'cJSON'
 pkgname=cJSON
-version=1.7.12
-revision=2
+version=1.7.13
+revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
 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=760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7
+checksum=d4e77a38f540f2c37f55758f2666655314f1f51c716fea5f279659940efdcf04
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: cJSON: update to 1.7.13.
  2020-04-11 13:37 [PR PATCH] cJSON: update to 1.7.13 daniel-eys
@ 2020-04-12  8:08 ` xtraeme
  0 siblings, 0 replies; 2+ messages in thread
From: xtraeme @ 2020-04-12  8:08 UTC (permalink / raw)
  To: ml

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

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

cJSON: update to 1.7.13.
https://github.com/void-linux/void-packages/pull/20877

Description:
Memory leak patch was picked from upstream, so now included in 1.7.13.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-04-12  8:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-11 13:37 [PR PATCH] cJSON: update to 1.7.13 daniel-eys
2020-04-12  8:08 ` [PR PATCH] [Merged]: " xtraeme

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).