diff --git a/CHANGELOG.md b/CHANGELOG.md index 85fa40cce32ab7a9e97f9fe647366a5fd045b1ec..51261ab52d92cca75e8351aca07b9bd24649b7bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +1.7.17 (Dec 26, 2023) +====== +Fixes: +------ +* Fix null reference in cJSON_SetValuestring(CVE-2023-50472), see #809 +* Fix null reference in cJSON_InsertItemInArray(CVE-2023-50471), see #809 and #810 + 1.7.16 (Jul 5, 2023) ====== Features: diff --git a/CMakeLists.txt b/CMakeLists.txt index 0810aba6fcce1ca57fa3420411900f88c36ca26b..baa5fea7066a5f39b11e033a9d250eff1d94d337 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) cmake_minimum_required(VERSION 3.0) project(cJSON - VERSION 1.7.16 + VERSION 1.7.17 LANGUAGES C) cmake_policy(SET CMP0054 NEW) # set CMP0054 policy diff --git a/Makefile b/Makefile index 40b61527b8031a63f131becb67ff6807f6944bbd..bc762e05cbdd884eed71bff3e0a63595f41a04f8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.7.16 +LIBVERSION = 1.7.17 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/README.OpenSource b/README.OpenSource index e10ae21a5552c9c59a7d5b78882d40b17d04f98e..1d29676fab0913a78ab039a0afb85cde88d5a34a 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,7 +3,7 @@ "Name": "cJSON", "License": "MIT License", "License File": "LICENSE", - "Version Number": "1.7.16", + "Version Number": "1.7.17", "Owner": "caichao9@huawei.com", "Upstream URL": "https://github.com/DaveGamble/cJSON/releases", "Description": "Ultralightweight JSON parser in ANSI C." diff --git a/cJSON.c b/cJSON.c index 12939467704441357e2cb8ace8032d72276a9044..5ccf6076c9da74061815d9c08b9cf1b6cd19c903 100644 --- a/cJSON.c +++ b/cJSON.c @@ -129,7 +129,7 @@ CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const 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 != 16) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 17) #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 23617dc8beb2562692abadbed7e4a5946ccea1e1..50d339517ad844ed557e5e632dca6901f66acda7 100644 --- a/cJSON.h +++ b/cJSON.h @@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 7 -#define CJSON_VERSION_PATCH 16 +#define CJSON_VERSION_PATCH 17 #include