diff --git a/CHANGELOG.md b/CHANGELOG.md index 6101e7f32b2684adc49d21075339a057ac92ccfa..0fb2f9ebbca30286289945f629b60611fdc92654 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +1.5.1 +===== +Fixes: +------ +* Add gcc version guard to the Makefile (#164), thanks @juvasquezg +* Fix incorrect free in `cJSON_Utils` if custom memory allocator is used (#166), thanks @prefetchnta + 1.5.0 ===== Features: diff --git a/CMakeLists.txt b/CMakeLists.txt index c37381b5adcd5de2716fdaa43473367905c9aeba..029bb296703a3f7a71602f7267727dc9eb01451e 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 0) +set(PROJECT_VERSION_PATCH 1) 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 d22615c804112b91b619237856076004a8bada02..42ebb67e2ef02ea41f1975be0c1455eda655e2e4 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.5.0 +LIBVERSION = 1.5.1 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index e653a1c013ead4cff53c9c611f4b443e0f053ee4..cb3bf13a65018b8d7ccf96344b1c68b15cfbf0c5 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 != 0) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 1) #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 622bcf58019ea9669354516b1195a4db2710a55c..97d6e82af65dd22b8a6ee0ce17ba0218e8e21d66 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 0 +#define CJSON_VERSION_PATCH 1 #include