From c717f2eb93d44b310728c289adfeb8cc6128f816 Mon Sep 17 00:00:00 2001
From: youbing54 <youbing3@huawei.com>
Date: Wed, 3 Jul 2024 11:10:56 +0800
Subject: [PATCH] IssueNo:
 https://gitee.com/openharmony/third_party_cJSON/issues/IAA61F describe:
 Upgrade cJSON to version 1.7.7 Feature or Bugfix: Bugfix Binary Source:Yes
 Signed-off-by: youbing54<youbing3@huawei.com>

---
 CHANGELOG.md      | 7 +++++++
 CMakeLists.txt    | 2 +-
 Makefile          | 2 +-
 README.OpenSource | 2 +-
 cJSON.c           | 2 +-
 cJSON.h           | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85fa40c..51261ab 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 0810aba..baa5fea 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 40b6152..bc762e0 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 e10ae21..1d29676 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 1293946..5ccf607 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 23617dc..50d3395 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 <stddef.h>
 
-- 
Gitee