From 687b1a2fe1e36a965083927981703f8f8d22a78e Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Thu, 16 May 2019 20:03:12 +0200 Subject: [PATCH 1/2] Update version to 1.7.12 --- CMakeLists.txt | 2 +- Makefile | 2 +- cJSON.c | 2 +- cJSON.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96b375d..407d359 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ include(GNUInstallDirs) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 7) -set(PROJECT_VERSION_PATCH 11) +set(PROJECT_VERSION_PATCH 12) set(CJSON_VERSION_SO 1) set(CJSON_UTILS_VERSION_SO 1) set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") diff --git a/Makefile b/Makefile index 93fffcc..cf1f09a 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.7.11 +LIBVERSION = 1.7.12 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index f9c2ffa..60b72c0 100644 --- a/cJSON.c +++ b/cJSON.c @@ -88,7 +88,7 @@ CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item) { } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 11) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 12) #error cJSON.h and cJSON.c have different versions. Make sure that both have the same. #endif diff --git a/cJSON.h b/cJSON.h index daf3128..592986b 100644 --- a/cJSON.h +++ b/cJSON.h @@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 7 -#define CJSON_VERSION_PATCH 11 +#define CJSON_VERSION_PATCH 12 #include From b93fd34044a3ab3d956b1a6c733d609853ada854 Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Fri, 17 May 2019 00:37:26 +0200 Subject: [PATCH 2/2] Update changelog and contributors --- CHANGELOG.md | 9 +++++++++ CONTRIBUTORS.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf091f0..4afe782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +1.7.12 +====== +Fixes: +------ +* Fix infinite loop in `cJSON_Minify` (potential Denial of Service), thanks @Alanscut for reporting. See #354 +* Fix link error for Visual Studio. Thanks @tan-wei, see #352 +* Undefine `true` and `false` for `cJSON_Utils` before redefining them. Thanks @raiden00pl, see #347 + + 1.7.11 ====== Fixes: diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6fb2c5c..c6a7310 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -14,6 +14,7 @@ Current Maintainer: [Max Bruckner](https://github.com/FSMaxB) * [Debora Grosse](https://github.com/DeboraG) * [dieyushi](https://github.com/dieyushi) * [Dōngwén Huáng (黄东文)](https://github.com/DongwenHuang) +* [Donough Liu](https://github.com/ldm0) * Eswar Yaganti * [Evan Todd](https://github.com/etodd) * [Fabrice Fontaine](https://github.com/ffontaine) @@ -34,12 +35,14 @@ Current Maintainer: [Max Bruckner](https://github.com/FSMaxB) * [Pawel Winogrodzki](https://github.com/PawelWMS) * [prefetchnta](https://github.com/prefetchnta) * [Rafael Leal Dias](https://github.com/rafaeldias) +* [raiden00pl](https://github.com/raiden00pl) * [Robin Mallinson](https://github.com/rmallins) * [Rod Vagg](https://github.com/rvagg) * [Roland Meertens](https://github.com/rmeertens) * [Romain Porte](https://github.com/MicroJoe) * [Simon Ricaldone](https://github.com/simon-p-r) * [Stephan Gatzka](https://github.com/gatzka) +* [tan-wei](https://github.com/tan-wei) * [Weston Schmidt](https://github.com/schmidtw) * [yangfl](https://github.com/yangfl) * [yuta-oxo](https://github.com/yuta-oxo)