diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fb2f9ebbca30286289945f629b60611fdc92654..7f848e1d9ef5fb5762a01ab299b3f1e16029fafb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +1.5.2 +===== +Fixes: +------ +* Fix a reading buffer overflow in `parse_string` (a167d9e381e5c84bc03de4e261757b031c0c690d) +* Fix compiling with -Wcomma (186cce3ece6ce6dfcb58ac8b2a63f7846c3493ad) +* Remove leftover attribute from tests (b537ca70a35680db66f1f5b8b437f7114daa699a) + 1.5.1 ===== Fixes: diff --git a/CMakeLists.txt b/CMakeLists.txt index 029bb296703a3f7a71602f7267727dc9eb01451e..bfd00ac9fc1ec5965fdf69926bc9f69253e60187 100644 --- 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 1) +set(PROJECT_VERSION_PATCH 2) 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 42ebb67e2ef02ea41f1975be0c1455eda655e2e4..a3d74e31a3d9c885dc07c50b5de891dd2a87c397 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.5.1 +LIBVERSION = 1.5.2 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index ee5ffe4016defaa52a86ec4f6d33681a10038bc8..c50c8ec7db7f1ecb4775ec81f1e9ad8cfedd4d55 100644 --- 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 != 1) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 2) #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 97d6e82af65dd22b8a6ee0ce17ba0218e8e21d66..eccf6bc885d253df860f72afa6ed97f3c015857e 100644 --- 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 1 +#define CJSON_VERSION_PATCH 2 #include