diff --git a/CHANGELOG.md b/CHANGELOG.md index b40c8957c888bcce6b25c6b72c91b6691704a711..17d0e93f853be8e02d632202ac87ebc46faf2d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +1.7.5 +===== +Fixes: +------ +* Fix a bug in the JSON Patch implementation of `cJSON Utils` (see #251), thanks @bobkocisko. + 1.7.4 ===== Fixes: diff --git a/CMakeLists.txt b/CMakeLists.txt index 41b8b29174a5cc3b79a2f26b4ebd194042f97922..09039f62c8000406063c64531fba9ef013a12a7a 100644 --- 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 4) +set(PROJECT_VERSION_PATCH 5) 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 01ee754051fe4b4f8a6aa8d69d044f428842d6db..10222facadae036e3c02ef9eed71695cd9ce4d41 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.7.4 +LIBVERSION = 1.7.5 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index b4fc727de0239c8499a8f062979ee239da1555dc..7e71ea9e87033afd48a4380b3ba63267ab771982 100644 --- a/cJSON.c +++ b/cJSON.c @@ -82,7 +82,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 != 4) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 5) #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 4dc1cfb762edfe53031e00302032e49baa45fa88..a9c68fa2c7e0c42933d127b7610ff7acde81590a 100644 --- a/cJSON.h +++ b/cJSON.h @@ -31,7 +31,7 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 7 -#define CJSON_VERSION_PATCH 4 +#define CJSON_VERSION_PATCH 5 #include