Browse Source

Release version 1.5.7

pull/199/head v1.5.7
Max Bruckner 7 years ago
parent
commit
88d66c5da9
  1. 7
      CHANGELOG.md
  2. 2
      CMakeLists.txt
  3. 1
      CONTRIBUTORS.md
  4. 2
      Makefile
  5. 2
      cJSON.c
  6. 2
      cJSON.h

7
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 1.5.6
===== =====
Fixes: Fixes:

2
CMakeLists.txt

@ -7,7 +7,7 @@ project(cJSON C)
set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MAJOR 1)
set(PROJECT_VERSION_MINOR 5) set(PROJECT_VERSION_MINOR 5)
set(PROJECT_VERSION_PATCH 6) set(PROJECT_VERSION_PATCH 7)
set(CJSON_VERSION_SO 1) set(CJSON_VERSION_SO 1)
set(CJSON_UTILS_VERSION_SO 1) set(CJSON_UTILS_VERSION_SO 1)
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

1
CONTRIBUTORS.md

@ -15,6 +15,7 @@ Contributors
* Ian Mobley * Ian Mobley
* Irwan Djadjadi * Irwan Djadjadi
* [IvanVoid](https://github.com/npi3pak) * [IvanVoid](https://github.com/npi3pak)
* [Jakub Wilk](https://github.com/jwilk)
* [Jiri Zouhar](https://github.com/loigu) * [Jiri Zouhar](https://github.com/loigu)
* [Jonathan Fether](https://github.com/jfether) * [Jonathan Fether](https://github.com/jfether)
* [Julián Vásquez](https://github.com/juvasquezg) * [Julián Vásquez](https://github.com/juvasquezg)

2
Makefile

@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c
LDLIBS = -lm LDLIBS = -lm
LIBVERSION = 1.5.6 LIBVERSION = 1.5.7
CJSON_SOVERSION = 1 CJSON_SOVERSION = 1
UTILS_SOVERSION = 1 UTILS_SOVERSION = 1

2
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 */ /* 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. #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
#endif #endif

2
cJSON.h

@ -31,7 +31,7 @@ extern "C"
/* project version */ /* project version */
#define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MAJOR 1
#define CJSON_VERSION_MINOR 5 #define CJSON_VERSION_MINOR 5
#define CJSON_VERSION_PATCH 6 #define CJSON_VERSION_PATCH 7
#include <stddef.h> #include <stddef.h>

Loading…
Cancel
Save