cJSON

mirror of Dave's cJSON
git clone git://git.thc420.xyz/cJSON
Log | Files | Refs | README | LICENSE

commit 3c8935676a97c7c97bf006db8312875b4f292f6c
parent 08d2bc766a82cd75764d036f9efef444590d1cf9
Author: Max Bruckner <max@maxbruckner.de>
Date:   Fri, 17 May 2019 01:05:59 +0200

Merge pull request #355 from DaveGamble/release-1.7.12

Release 1.7.12
Diffstat:
MCHANGELOG.md | 9+++++++++
MCMakeLists.txt | 2+-
MCONTRIBUTORS.md | 3+++
MMakefile | 2+-
McJSON.c | 2+-
McJSON.h | 2+-
6 files changed, 16 insertions(+), 4 deletions(-)

diff --git 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/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/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) diff --git 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 @@ -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 @@ -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 <stddef.h>