cJSON

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

commit 88d66c5da9431d97108da4711b44f6adf70f9e49
parent 954d61e5e7cb9dc6c480fc28ac1cdceca07dd5bd
Author: Max Bruckner <max@maxbruckner.de>
Date:   Wed, 12 Jul 2017 23:13:14 +0200

Release version 1.5.7

Diffstat:
MCHANGELOG.md | 7+++++++
MCMakeLists.txt | 2+-
MCONTRIBUTORS.md | 1+
MMakefile | 2+-
McJSON.c | 2+-
McJSON.h | 2+-
6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,3 +1,10 @@ +1.5.7 +===== +Fixes: +------ +* Fix a bug where realloc failing would return a pointer to an invalid memory address. This is a security issue as it could potentially be used by an attacker to write to arbitrary memory addresses. (see #189), fixed in (954d61e5e7cb9dc6c480fc28ac1cdceca07dd5bd), big thanks @timothyjohncarney for reporting this issue +* Fix a spelling mistake in the AFL fuzzer dictionary (#185), thanks @jwilk + 1.5.6 ===== Fixes: diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -7,7 +7,7 @@ project(cJSON C) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 5) -set(PROJECT_VERSION_PATCH 6) +set(PROJECT_VERSION_PATCH 7) 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 @@ -15,6 +15,7 @@ Contributors * Ian Mobley * Irwan Djadjadi * [IvanVoid](https://github.com/npi3pak) +* [Jakub Wilk](https://github.com/jwilk) * [Jiri Zouhar](https://github.com/loigu) * [Jonathan Fether](https://github.com/jfether) * [Julián Vásquez](https://github.com/juvasquezg) diff --git a/Makefile b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.5.6 +LIBVERSION = 1.5.7 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c @@ -58,7 +58,7 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void) } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 6) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 7) #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 @@ -31,7 +31,7 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 5 -#define CJSON_VERSION_PATCH 6 +#define CJSON_VERSION_PATCH 7 #include <stddef.h>