Release Version 1.7.10

cJSON_Utils: sort_lists: Properly split the lists
Since `prev` is not used anymore after that by the algorithm it should have been fine anyways, still splitting it correctly in the first place is probably a good idea. Thanks @andysCaplin for the fix!
2018-12-20 18:15:05 +01:00 · 2018-12-20 18:12:23 +01:00 · 2018-12-20 18:04:52 +01:00 · 2018-12-16 11:21:35 +01:00
7 changed files with 14 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
+1.7.10
+======
+Fixes:
+------
+* Fix package config file for `libcjson`. Thanks @shiluotang for reporting (#321)
+* Correctly split lists in `cJSON_Utils`'s merge sort. Thanks @andysCaplin for the fix (#322)
+
 1.7.9
 =====
 Fixes:
 ------
 * Fix a bug where `cJSON_GetObjectItemCaseSensitive` would pass a nullpointer to `strcmp` when called on an array (#315). Thanks @yuweol for reporting.
 * Fix error in `cJSON_Utils` where the case sensitivity was not respected (#317). Thanks @yuta-oxo for fixing.
+* Fix some warnings detected by the Visual Studio Static Analyzer (#307). Thanks @bnason-nf

 1.7.8
 =====
--- 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 9)
+set(PROJECT_VERSION_PATCH 10)
 set(CJSON_VERSION_SO 1)
 set(CJSON_UTILS_VERSION_SO 1)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
--- a/2
+++ b/2
@@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c

 LDLIBS = -lm

-LIBVERSION = 1.7.9
+LIBVERSION = 1.7.10
 CJSON_SOVERSION = 1
 UTILS_SOVERSION = 1

--- a/cJSON.c
+++ b/cJSON.c
@@ -81,7 +81,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 != 9)
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 10)
    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
 #endif

--- 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 9
+#define CJSON_VERSION_PATCH 10

 #include <stddef.h>

--- a/cJSON_Utils.c
+++ b/cJSON_Utils.c
@@ -499,6 +499,7 @@ static cJSON *sort_list(cJSON *list, const cJSON_bool case_sensitive)
    {
        /* Split the lists */
        second->prev->next = NULL;
+        second->prev = NULL;
    }

    /* Recursively sort the sub-lists. */
--- a/library_config/libcjson.pc.in
+++ b/library_config/libcjson.pc.in
@@ -6,5 +6,5 @@ Version: @PROJECT_VERSION@
 Description: Ultralightweight JSON parser in ANSI C
 URL: https://github.com/DaveGamble/cJSON
 Libs: -L${libdir} -lcjson
-Libs.Private: -lm
+Libs.private: -lm
 Cflags: -I${includedir}
Author	SHA1	Message	Date
Max Bruckner	c69134d017	Release Version 1.7.10	2018-12-20 18:15:05 +01:00
Max Bruckner	563d861f92	cJSON_Utils: sort_lists: Properly split the lists Since `prev` is not used anymore after that by the algorithm it should have been fine anyways, still splitting it correctly in the first place is probably a good idea. Thanks @andysCaplin for the fix!	2018-12-20 18:12:23 +01:00
Max Bruckner	6820448db5	libcjson.pc.in: Use Libs.private instead of Private Thanks @shiluotang	2018-12-20 18:04:52 +01:00
Max Bruckner	d44b594ab3	Add missing changelog entry	2018-12-16 11:21:35 +01:00