Use character literal to declare range of nonprintable characters.

New macro static_strlen and replace magic numbers with it.
print_value: Use sizeof(literal) instead of magic numbers
2023-08-10 21:13:26 +03:00 · 2018-01-11 00:19:41 +01:00 · 2018-01-10 17:43:25 +01:00 · 2018-01-10 15:45:14 +01:00
38 changed files with 236 additions and 671 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,23 +0,0 @@
-root = true
-
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[Makefile]
-indent_style = tab
-indent_size = unset
-
-# ignore external repositories and test inputs
-[tests/{unity,json-patch-tests,inputs}/*]
-indent_style = unset
-indent_size = unset
-end_of_line = unset
-charset = unset
-trim_trailing_whitespace = unset
-insert_final_newline = unset
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-*  					text=auto
-/tests/inputs/*	text eol=lf
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,3 @@ libcjson.so.*
 libcjson_utils.so.*
 *.orig
 .vscode
-.idea
-cmake-build-debug
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,73 +1,3 @@
-1.7.11
-======
-Fixes:
------
-* Fix a bug where cJSON_Minify could overflow it's buffer, both reading and writing. This is a security issue. (see #338). Big thanks @bigric3 for reporting.
-* Unset `true` and `false` macros before setting them if they exist. See #339, thanks @raiden00pl for reporting
-
-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
-=====
-Fixes:
------
-* cJSON now works with the `__stdcall` calling convention on Windows, see #295, thanks @zhindes for contributing
-
-1.7.7
-=====
-Fixes:
------
-* Fix a memory leak when realloc fails (see #267), thanks @AlfieDeng for reporting
-* Fix a typo in the header file (see #266), thanks @zhaozhixu
-
-1.7.6
-=====
-Fixes:
------
-* Add `SONAME` to the ELF files built by the Makefile (see #252), thanks @YanhaoMo for reporting
-* Add include guards and `extern "C"` to `cJSON_Utils.h` (see #256), thanks @daschfg for reporting
-
-Other changes:
--------------
-* Mark the Makefile as deprecated in the README.
-
-1.7.5
-=====
-Fixes:
------
-* Fix a bug in the JSON Patch implementation of `cJSON Utils` (see #251), thanks @bobkocisko.
-
-1.7.4
-=====
-Fixes:
------
-* Fix potential use after free if the `string` parameter to `cJSON_AddItemToObject` is an alias of the `string` property of the object that is added (#248). Thanks @hhallen for reporting.
-
-1.7.3
-=====
-Fixes:
------
-* Fix potential double free, thanks @projectgus for reporting (see #241)
-
-1.7.2
-=====
-Fixes:
------
-* Fix the use of GNUInstallDirs variables and the pkgconfig file. Thanks @zeerd for reporting (see #240)
-
 1.7.1
 =====
 Fixes:
--- 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 11)
+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}")
@@ -49,15 +49,11 @@ if (ENABLE_CUSTOM_COMPILER_FLAGS)
            -Wswitch-enum
        )
    elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-        # Disable warning c4001 - nonstandard extension 'single line comment' was used
-        # Define _CRT_SECURE_NO_WARNINGS to disable deprecation warnings for "insecure" C library functions
        list(APPEND custom_compiler_flags
            /GS
            /Za
            /sdl
            /W4
-            /wd4001
-            /D_CRT_SECURE_NO_WARNINGS
        )
    endif()
 endif()
@@ -111,6 +107,12 @@ endforeach()

 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${supported_compiler_flags}")

+#variables for pkg-config
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(libdir "${CMAKE_INSTALL_LIBDIR}")
+set(version "${PROJECT_VERSION}")
+set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
+
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(ENABLE_TARGET_EXPORT "Enable exporting of CMake targets. Disable when it causes problems!" ON)

@@ -147,15 +149,15 @@ endif()
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
    "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)

-install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}")
+install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${CJSON_LIB}")
 if (BUILD_SHARED_AND_STATIC_LIBS)
-    install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+    install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 endif()
 if(ENABLE_TARGET_EXPORT)
    # export library information for CMake projects
-    install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
+    install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
 endif()

 set_target_properties("${CJSON_LIB}"
@@ -186,15 +188,15 @@ if(ENABLE_CJSON_UTILS)
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in"
        "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY)

-    install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
+    install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
    if (BUILD_SHARED_AND_STATIC_LIBS)
-        install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+        install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
    endif()
-    install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+    install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
    if(ENABLE_TARGET_EXPORT)
      # export library information for CMake projects
-      install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
+      install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
    endif()

    set_target_properties("${CJSON_UTILS_LIB}"
@@ -214,7 +216,7 @@ configure_file(
 # Install package config files
 install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
    ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
-    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cJSON")
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")

 option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
 if(ENABLE_CJSON_TEST)
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -7,8 +7,6 @@ Current Maintainer: [Max Bruckner](https://github.com/FSMaxB)
 * [Ajay Bhargav](https://github.com/ajaybhargav)
 * [Alper Akcan](https://github.com/alperakcan)
 * [Anton Sergeev](https://github.com/anton-sergeev)
-* [Benbuck Nason](https://github.com/bnason-nf)
-* [Bob Kocisko](https://github.com/bobkocisko)
 * [Christian Schulze](https://github.com/ChristianSch)
 * [Casperinous](https://github.com/Casperinous)
 * [Debora Grosse](https://github.com/DeboraG)
@@ -42,10 +40,5 @@ Current Maintainer: [Max Bruckner](https://github.com/FSMaxB)
 * [Stephan Gatzka](https://github.com/gatzka)
 * [Weston Schmidt](https://github.com/schmidtw)
 * [yangfl](https://github.com/yangfl)
-* [yuta-oxo](https://github.com/yuta-oxo)
-* [Zach Hindes](https://github.com/zhindes)
-* [Zhao Zhixu](https://github.com/zhaozhixu)

 And probably more people on [SourceForge](https://sourceforge.net/p/cjson/bugs/search/?q=status%3Aclosed-rejected+or+status%3Aclosed-out-of-date+or+status%3Awont-fix+or+status%3Aclosed-fixed+or+status%3Aclosed&page=0)
-
-Also thanks to all the people who reported bugs and suggested new features.
--- a/13
+++ b/13
@@ -8,13 +8,10 @@ CJSON_TEST_SRC = cJSON.c test.c

 LDLIBS = -lm

-LIBVERSION = 1.7.11
+LIBVERSION = 1.7.1
 CJSON_SOVERSION = 1
 UTILS_SOVERSION = 1

-CJSON_SO_LDFLAG=-Wl,-soname=$(CJSON_LIBNAME).so.$(CJSON_SOVERSION)
-UTILS_SO_LDFLAG=-Wl,-soname=$(UTILS_LIBNAME).so.$(UTILS_SOVERSION)
-
 PREFIX ?= /usr/local
 INCLUDE_PATH ?= include/cjson
 LIBRARY_PATH ?= lib
@@ -26,7 +23,7 @@ INSTALL ?= cp -a

 # validate gcc version for use fstack-protector-strong
 MIN_GCC_VERSION = "4.9"
-GCC_VERSION := "`$(CC) -dumpversion`"
+GCC_VERSION := "`gcc -dumpversion`"
 IS_GCC_ABOVE_MIN_VERSION := $(shell expr "$(GCC_VERSION)" ">=" "$(MIN_GCC_VERSION)")
 ifeq "$(IS_GCC_ABOVE_MIN_VERSION)" "1"
    CFLAGS += -fstack-protector-strong
@@ -45,8 +42,6 @@ STATIC = a
 ## create dynamic (shared) library on Darwin (base OS for MacOSX and IOS)
 ifeq (Darwin, $(uname))
 	SHARED = dylib
-	CJSON_SO_LDFLAG = ""
-	UTILS_SO_LDFLAG = ""
 endif

 #cJSON library names
@@ -95,10 +90,10 @@ $(UTILS_STATIC): $(UTILS_OBJ)
 #shared libraries .so.1.0.0
 #cJSON
 $(CJSON_SHARED_VERSION): $(CJSON_OBJ)
-	$(CC) -shared -o $@ $< $(CJSON_SO_LDFLAG) $(LDFLAGS)
+	$(CC) -shared -o $@ $< $(LDFLAGS)
 #cJSON_Utils
 $(UTILS_SHARED_VERSION): $(UTILS_OBJ)
-	$(CC) -shared -o $@ $< $(UTILS_SO_LDFLAG) $(LDFLAGS)
+	$(CC) -shared -o $@ $< $(LDFLAGS)

 #objects
 #cJSON
--- a/README.md
+++ b/README.md
@@ -127,11 +127,9 @@ make DESTDIR=$pkgdir install
 On Windows CMake is usually used to create a Visual Studio solution file by running it inside the Developer Command Prompt for Visual Studio, for exact steps follow the official documentation from CMake and Microsoft and use the online search engine of your choice. The descriptions of the the options above still generally apply, although not all of them work on Windows.

 #### Makefile
-**NOTE:** This Method is deprecated. Use CMake if at all possible. Makefile support is limited to fixing bugs.
-
 If you don't have CMake available, but still have GNU make. You can use the makefile to build cJSON:

-Run this command in the directory with the source code and it will automatically compile static and shared libraries and a little test program (not the full test suite).
+Run this command in the directory with the source code and it will automatically compile static and shared libraries and a little test program.

 ```
 make all
@@ -298,7 +296,6 @@ In this example we want to build and parse the following JSON:
 Let's build the above JSON and print it to a string:
 ```c
 //create a monitor with a list of supported resolutions
-//NOTE: Returns a heap allocated string, you are required to free it after use.
 char* create_monitor(void)
 {
    const unsigned int resolution_numbers[3][2] = {
@@ -374,7 +371,6 @@ end:

 Alternatively we can use the `cJSON_Add...ToObject` helper functions to make our lifes a little easier:
 ```c
-//NOTE: Returns a heap allocated string, you are required to free it after use.
 char *create_monitor_with_helpers(void)
 {
    const unsigned int resolution_numbers[3][2] = {
--- a/cJSON.c
+++ b/cJSON.c
@@ -41,6 +41,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
+#include <float.h>
 #include <limits.h>
 #include <ctype.h>

@@ -58,14 +59,7 @@
 #include "cJSON.h"

 /* define our own boolean type */
-#ifdef true
-#undef true
-#endif
 #define true ((cJSON_bool)1)
-
-#ifdef false
-#undef false
-#endif
 #define false ((cJSON_bool)0)

 typedef struct {
@@ -88,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 != 11)
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 1)
    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
 #endif

@@ -126,22 +120,22 @@ static int case_insensitive_strcmp(const unsigned char *string1, const unsigned

 typedef struct internal_hooks
 {
-    void *(CJSON_CDECL *allocate)(size_t size);
-    void (CJSON_CDECL *deallocate)(void *pointer);
-    void *(CJSON_CDECL *reallocate)(void *pointer, size_t size);
+    void *(*allocate)(size_t size);
+    void (*deallocate)(void *pointer);
+    void *(*reallocate)(void *pointer, size_t size);
 } internal_hooks;

 #if defined(_MSC_VER)
 /* work around MSVC error C2322: '...' address of dillimport '...' is not static */
-static void * CJSON_CDECL internal_malloc(size_t size)
+static void *internal_malloc(size_t size)
 {
    return malloc(size);
 }
-static void CJSON_CDECL internal_free(void *pointer)
+static void internal_free(void *pointer)
 {
    free(pointer);
 }
-static void * CJSON_CDECL internal_realloc(void *pointer, size_t size)
+static void *internal_realloc(void *pointer, size_t size)
 {
    return realloc(pointer, size);
 }
@@ -151,8 +145,8 @@ static void * CJSON_CDECL internal_realloc(void *pointer, size_t size)
 #define internal_realloc realloc
 #endif

-/* strlen of character literals resolved at compile time */
-#define static_strlen(string_literal) (sizeof(string_literal) - sizeof(""))
+/* Compile time strlen for string literals */
+#define static_strlen(literal) ((size_t)(sizeof(literal) - sizeof("")))

 static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };

@@ -289,7 +283,7 @@ static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_bu
    /* copy the number into a temporary buffer and replace '.' with the decimal point
     * of the current locale (for strtod)
     * This also takes care of '\0' not necessarily being available for marking the end of the input */
-    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
+    for (i = 0; (i < (sizeof(number_c_string) - sizeof(""))) && can_access_at_index(input_buffer, i); i++)
    {
        switch (buffer_at_offset(input_buffer)[i])
        {
@@ -334,7 +328,7 @@ loop_end:
    {
        item->valueint = INT_MAX;
    }
-    else if (number <= (double)INT_MIN)
+    else if (number <= INT_MIN)
    {
        item->valueint = INT_MIN;
    }
@@ -356,7 +350,7 @@ CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
    {
        object->valueint = INT_MAX;
    }
-    else if (number <= (double)INT_MIN)
+    else if (number <= INT_MIN)
    {
        object->valueint = INT_MIN;
    }
@@ -515,7 +509,7 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out
    }

    /* sprintf failed or buffer overrun occured */
-    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
+    if ((length < 0) || (length > (int)(sizeof(number_buffer) - sizeof(""))))
    {
        return false;
    }
@@ -594,14 +588,14 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
    unsigned char sequence_length = 0;
    unsigned char first_byte_mark = 0;

-    if ((input_end - first_sequence) < 6)
+    if ((input_end - first_sequence) < ((int)static_strlen("\\uXXXX")))
    {
        /* input ends unexpectedly */
        goto fail;
    }

    /* get the first utf16 sequence */
-    first_code = parse_hex4(first_sequence + 2);
+    first_code = parse_hex4(first_sequence + static_strlen("\\u"));

    /* check that the code is valid */
    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
@@ -612,11 +606,11 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
    /* UTF16 surrogate pair */
    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
    {
-        const unsigned char *second_sequence = first_sequence + 6;
+        const unsigned char *second_sequence = first_sequence + static_strlen("\\uXXXX");
        unsigned int second_code = 0;
-        sequence_length = 12; /* \uXXXX\uXXXX */
+        sequence_length = static_strlen("\\uXXXX\\uXXXX");

-        if ((input_end - second_sequence) < 6)
+        if ((input_end - second_sequence) < ((int)static_strlen("\\uXXXX")))
        {
            /* input ends unexpectedly */
            goto fail;
@@ -629,7 +623,7 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
        }

        /* get the second utf16 sequence */
-        second_code = parse_hex4(second_sequence + 2);
+        second_code = parse_hex4(second_sequence + static_strlen("\\u"));
        /* check that the code is valid */
        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
        {
@@ -643,7 +637,7 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
    }
    else
    {
-        sequence_length = 6; /* \uXXXX */
+        sequence_length = static_strlen("\\uXXXX");
        codepoint = first_code;
    }

@@ -707,8 +701,8 @@ fail:
 /* Parse the input text into an unescaped cinput, and populate item. */
 static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
 {
-    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
-    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
+    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + static_strlen("\"");
+    const unsigned char *input_end = buffer_at_offset(input_buffer) + static_strlen("\"");
    unsigned char *output_pointer = NULL;
    unsigned char *output = NULL;

@@ -727,7 +721,7 @@ static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_bu
            /* is escape sequence */
            if (input_end[0] == '\\')
            {
-                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
+                if ((size_t)(input_end + sizeof("") - input_buffer->content) >= input_buffer->length)
                {
                    /* prevent buffer overflow when last input character is a backslash */
                    goto fail;
@@ -762,7 +756,7 @@ static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_bu
        /* escape sequence */
        else
        {
-            unsigned char sequence_length = 2;
+            unsigned char sequence_length = static_strlen("\\X");
            if ((input_end - input_pointer) < 1)
            {
                goto fail;
@@ -877,10 +871,10 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
                escape_characters++;
                break;
            default:
-                if (*input_pointer < 32)
+                if (*input_pointer < '\x20')
                {
-                    /* UTF-16 escape sequence uXXXX */
-                    escape_characters += 5;
+                    /* UTF-16 escape sequence */
+                    escape_characters += static_strlen("uXXXX");
                }
                break;
        }
@@ -897,7 +891,7 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
    if (escape_characters == 0)
    {
        output[0] = '\"';
-        memcpy(output + 1, input, output_length);
+        memcpy(output + static_strlen("\""), input, output_length);
        output[output_length + 1] = '\"';
        output[output_length + 2] = '\0';

@@ -905,11 +899,11 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
    }

    output[0] = '\"';
-    output_pointer = output + 1;
+    output_pointer = output + static_strlen("\"");
    /* copy the string */
    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
    {
-        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
+        if ((*input_pointer >= '\x20') && (*input_pointer != '\"') && (*input_pointer != '\\'))
        {
            /* normal character, copy */
            *output_pointer = *input_pointer;
@@ -944,7 +938,7 @@ static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffe
                default:
                    /* escape and print as unicode codepoint */
                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
-                    output_pointer += 4;
+                    output_pointer += static_strlen("XXXX");
                    break;
            }
        }
@@ -977,7 +971,7 @@ static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
        return NULL;
    }

-    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
+    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= '\x20'))
    {
       buffer->offset++;
    }
@@ -998,9 +992,9 @@ static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
        return NULL;
    }

-    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
+    if (can_access_at_index(buffer, sizeof("\xEF\xBB\xBF")) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", static_strlen("\xEF\xBB\xBF")) == 0))
    {
-        buffer->offset += 3;
+        buffer->offset += static_strlen("\xEF\xBB\xBF");
    }

    return buffer;
@@ -1123,10 +1117,10 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
    if (hooks->reallocate != NULL)
    {
        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
+        buffer->buffer = NULL;
        if (printed == NULL) {
            goto fail;
        }
-        buffer->buffer = NULL;
    }
    else /* otherwise copy the JSON over to a new buffer */
    {
@@ -1228,25 +1222,25 @@ static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buf

    /* parse the different types of values */
    /* null */
-    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
+    if (can_read(input_buffer, static_strlen("null")) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", static_strlen("null")) == 0))
    {
        item->type = cJSON_NULL;
-        input_buffer->offset += 4;
+        input_buffer->offset += static_strlen("null");
        return true;
    }
    /* false */
-    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
+    if (can_read(input_buffer, static_strlen("false")) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", static_strlen("false")) == 0))
    {
        item->type = cJSON_False;
-        input_buffer->offset += 5;
+        input_buffer->offset += static_strlen("false");
        return true;
    }
    /* true */
-    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
+    if (can_read(input_buffer, static_strlen("true")) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", static_strlen("true")) == 0))
    {
        item->type = cJSON_True;
        item->valueint = 1;
-        input_buffer->offset += 4;
+        input_buffer->offset += static_strlen("true");
        return true;
    }
    /* string */
@@ -1286,7 +1280,7 @@ static cJSON_bool print_value(const cJSON * const item, printbuffer * const outp
    switch ((item->type) & 0xFF)
    {
        case cJSON_NULL:
-            output = ensure(output_buffer, 5);
+            output = ensure(output_buffer, sizeof("null"));
            if (output == NULL)
            {
                return false;
@@ -1295,7 +1289,7 @@ static cJSON_bool print_value(const cJSON * const item, printbuffer * const outp
            return true;

        case cJSON_False:
-            output = ensure(output_buffer, 6);
+            output = ensure(output_buffer, sizeof("false"));
            if (output == NULL)
            {
                return false;
@@ -1304,7 +1298,7 @@ static cJSON_bool print_value(const cJSON * const item, printbuffer * const outp
            return true;

        case cJSON_True:
-            output = ensure(output_buffer, 5);
+            output = ensure(output_buffer, sizeof("true"));
            if (output == NULL)
            {
                return false;
@@ -1320,6 +1314,10 @@ static cJSON_bool print_value(const cJSON * const item, printbuffer * const outp
            size_t raw_length = 0;
            if (item->valuestring == NULL)
            {
+                if (!output_buffer->noalloc)
+                {
+                    output_buffer->hooks.deallocate(output_buffer->buffer);
+                }
                return false;
            }

@@ -1455,7 +1453,7 @@ static cJSON_bool print_array(const cJSON * const item, printbuffer * const outp

    /* Compose the output array. */
    /* opening square bracket */
-    output_pointer = ensure(output_buffer, 1);
+    output_pointer = ensure(output_buffer, static_strlen("["));
    if (output_pointer == NULL)
    {
        return false;
@@ -1474,8 +1472,8 @@ static cJSON_bool print_array(const cJSON * const item, printbuffer * const outp
        update_offset(output_buffer);
        if (current_element->next)
        {
-            length = (size_t) (output_buffer->format ? 2 : 1);
-            output_pointer = ensure(output_buffer, length + 1);
+            length = (size_t) (output_buffer->format ? static_strlen(", ") : static_strlen(","));
+            output_pointer = ensure(output_buffer, length + sizeof(""));
            if (output_pointer == NULL)
            {
                return false;
@@ -1491,7 +1489,7 @@ static cJSON_bool print_array(const cJSON * const item, printbuffer * const outp
        current_element = current_element->next;
    }

-    output_pointer = ensure(output_buffer, 2);
+    output_pointer = ensure(output_buffer, sizeof("]"));
    if (output_pointer == NULL)
    {
        return false;
@@ -1625,8 +1623,8 @@ static cJSON_bool print_object(const cJSON * const item, printbuffer * const out
    }

    /* Compose the output: */
-    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
-    output_pointer = ensure(output_buffer, length + 1);
+    length = (size_t) (output_buffer->format ? static_strlen("{\n") : static_strlen("{"));
+    output_pointer = ensure(output_buffer, length + sizeof(""));
    if (output_pointer == NULL)
    {
        return false;
@@ -1664,7 +1662,7 @@ static cJSON_bool print_object(const cJSON * const item, printbuffer * const out
        }
        update_offset(output_buffer);

-        length = (size_t) (output_buffer->format ? 2 : 1);
+        length = (size_t) (output_buffer->format ? static_strlen(":\t") : static_strlen(":"));
        output_pointer = ensure(output_buffer, length);
        if (output_pointer == NULL)
        {
@@ -1685,8 +1683,8 @@ static cJSON_bool print_object(const cJSON * const item, printbuffer * const out
        update_offset(output_buffer);

        /* print comma if not last */
-        length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0));
-        output_pointer = ensure(output_buffer, length + 1);
+        length = (size_t) ((output_buffer->format ? static_strlen(",") : static_strlen("")) + (current_item->next ? static_strlen(",") : static_strlen("")));
+        output_pointer = ensure(output_buffer, length + sizeof(""));
        if (output_pointer == NULL)
        {
            return false;
@@ -1706,7 +1704,7 @@ static cJSON_bool print_object(const cJSON * const item, printbuffer * const out
        current_item = current_item->next;
    }

-    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
+    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth - 1 + sizeof("}")) : sizeof("}"));
    if (output_pointer == NULL)
    {
        return false;
@@ -1791,7 +1789,7 @@ static cJSON *get_object_item(const cJSON * const object, const char * const nam
    current_element = object->child;
    if (case_sensitive)
    {
-        while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0))
+        while ((current_element != NULL) && (strcmp(name, current_element->string) != 0))
        {
            current_element = current_element->next;
        }
@@ -1804,10 +1802,6 @@ static cJSON *get_object_item(const cJSON * const object, const char * const nam
        }
    }

-    if ((current_element == NULL) || (current_element->string == NULL)) {
-        return NULL;
-    }
-
    return current_element;
 }

@@ -1908,37 +1902,32 @@ static void* cast_away_const(const void* string)

 static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key)
 {
-    char *new_key = NULL;
-    int new_type = cJSON_Invalid;
-
    if ((object == NULL) || (string == NULL) || (item == NULL))
    {
        return false;
    }

-    if (constant_key)
-    {
-        new_key = (char*)cast_away_const(string);
-        new_type = item->type | cJSON_StringIsConst;
-    }
-    else
-    {
-        new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
-        if (new_key == NULL)
-        {
-            return false;
-        }
-
-        new_type = item->type & ~cJSON_StringIsConst;
-    }
-
    if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
    {
        hooks->deallocate(item->string);
    }

-    item->string = new_key;
-    item->type = new_type;
+    if (constant_key)
+    {
+        item->string = (char*)cast_away_const(string);
+        item->type |= cJSON_StringIsConst;
+    }
+    else
+    {
+        char *key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
+        if (key == NULL)
+        {
+            return false;
+        }
+
+        item->string = key;
+        item->type &= ~cJSON_StringIsConst;
+    }

    return add_item_to_array(object, item);
 }
@@ -2314,7 +2303,7 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
        {
            item->valueint = INT_MAX;
        }
-        else if (num <= (double)INT_MIN)
+        else if (num <= INT_MIN)
        {
            item->valueint = INT_MIN;
        }
@@ -2640,94 +2629,69 @@ fail:
    return NULL;
 }

-static void skip_oneline_comment(char **input)
-{
-    *input += static_strlen("//");
-
-    for (; (*input)[0] != '\0'; ++(*input))
-    {
-        if ((*input)[0] == '\n') {
-            *input += static_strlen("\n");
-            return;
-        }
-    }
-}
-
-static void skip_multiline_comment(char **input)
-{
-    *input += static_strlen("/*");
-
-    for (; (*input)[0] != '\0'; ++(*input))
-    {
-        if (((*input)[0] == '*') && ((*input)[1] == '/'))
-        {
-            *input += static_strlen("*/");
-            return;
-        }
-    }
-}
-
-static void minify_string(char **input, char **output) {
-    (*output)[0] = (*input)[0];
-    *input += static_strlen("\"");
-    *output += static_strlen("\"");
-
-
-    for (; (*input)[0] != '\0'; (void)++(*input), ++(*output)) {
-        (*output)[0] = (*input)[0];
-
-        if ((*input)[0] == '\"') {
-            (*output)[0] = '\"';
-            *input += static_strlen("\"");
-            *output += static_strlen("\"");
-            return;
-        } else if (((*input)[0] == '\\') && ((*input)[1] == '\"')) {
-            (*output)[1] = (*input)[1];
-            *input += static_strlen("\"");
-            *output += static_strlen("\"");
-        }
-    }
-}
-
 CJSON_PUBLIC(void) cJSON_Minify(char *json)
 {
-    char *into = json;
+    unsigned char *into = (unsigned char*)json;

    if (json == NULL)
    {
        return;
    }

-    while (json[0] != '\0')
+    while (*json)
    {
-        switch (json[0])
+        if (*json == ' ')
        {
-            case ' ':
-            case '\t':
-            case '\r':
-            case '\n':
+            json++;
+        }
+        else if (*json == '\t')
+        {
+            /* Whitespace characters. */
+            json++;
+        }
+        else if (*json == '\r')
+        {
+            json++;
+        }
+        else if (*json=='\n')
+        {
+            json++;
+        }
+        else if ((*json == '/') && (json[1] == '/'))
+        {
+            /* double-slash comments, to end of line. */
+            while (*json && (*json != '\n'))
+            {
                json++;
-                break;
-
-            case '/':
-                if (json[1] == '/')
-                {
-                    skip_oneline_comment(&json);
-                }
-                else if (json[1] == '*')
-                {
-                    skip_multiline_comment(&json);
-                }
-                break;
-
-            case '\"':
-                minify_string(&json, (char**)&into);
-                break;
-
-            default:
-                into[0] = json[0];
+            }
+        }
+        else if ((*json == '/') && (json[1] == '*'))
+        {
+            /* multiline comments. */
+            while (*json && !((*json == '*') && (json[1] == '/')))
+            {
                json++;
-                into++;
+            }
+            json += static_strlen("*/");
+        }
+        else if (*json == '\"')
+        {
+            /* string literals, which are \" sensitive. */
+            *into++ = (unsigned char)*json++;
+            while (*json && (*json != '\"'))
+            {
+                if (*json == '\\')
+                {
+                    *into++ = (unsigned char)*json++;
+                }
+                *into++ = (unsigned char)*json++;
+            }
+            *into++ = (unsigned char)*json++;
+        }
+        else
+        {
+            /* All other characters. */
+            *into++ = (unsigned char)*json++;
        }
    }

--- a/cJSON.h
+++ b/cJSON.h
@@ -28,60 +28,10 @@ extern "C"
 {
 #endif

-#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
-#define __WINDOWS__
-#endif
-
-#ifdef __WINDOWS__
-
-/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
-
-CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
-CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
-CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
-
-For *nix builds that support visibility attribute, you can define similar behavior by
-
-setting default visibility to hidden by adding
-fvisibility=hidden (for gcc)
-or
-xldscope=hidden (for sun cc)
-to CFLAGS
-
-then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
-
-*/
-
-#define CJSON_CDECL __cdecl
-#define CJSON_STDCALL __stdcall
-
-/* export symbols by default, this is necessary for copy pasting the C and header file */
-#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
-#define CJSON_EXPORT_SYMBOLS
-#endif
-
-#if defined(CJSON_HIDE_SYMBOLS)
-#define CJSON_PUBLIC(type)   type CJSON_STDCALL
-#elif defined(CJSON_EXPORT_SYMBOLS)
-#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
-#elif defined(CJSON_IMPORT_SYMBOLS)
-#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
-#endif
-#else /* !__WINDOWS__ */
-#define CJSON_CDECL
-#define CJSON_STDCALL
-
-#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
-#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
-#else
-#define CJSON_PUBLIC(type) type
-#endif
-#endif
-
 /* project version */
 #define CJSON_VERSION_MAJOR 1
 #define CJSON_VERSION_MINOR 7
-#define CJSON_VERSION_PATCH 11
+#define CJSON_VERSION_PATCH 1

 #include <stddef.h>

@@ -124,13 +74,55 @@ typedef struct cJSON

 typedef struct cJSON_Hooks
 {
-      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
-      void *(CJSON_CDECL *malloc_fn)(size_t sz);
-      void (CJSON_CDECL *free_fn)(void *ptr);
+      void *(*malloc_fn)(size_t sz);
+      void (*free_fn)(void *ptr);
 } cJSON_Hooks;

 typedef int cJSON_bool;

+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 2 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type __stdcall
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type __stdcall
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type __stdcall
+#endif
+#else /* !WIN32 */
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
 /* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
 * This is to prevent stack overflows. */
 #ifndef CJSON_NESTING_LIMIT
@@ -164,7 +156,7 @@ CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);

 /* Returns the number of items in an array (or object). */
 CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
-/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
 CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
 /* Get item "string" from object. Case insensitive. */
 CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
--- a/cJSON_Utils.c
+++ b/cJSON_Utils.c
@@ -499,7 +499,6 @@ 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. */
@@ -511,7 +510,7 @@ static cJSON *sort_list(cJSON *list, const cJSON_bool case_sensitive)
    while ((first != NULL) && (second != NULL))
    {
        cJSON *smaller = NULL;
-        if (compare_strings((unsigned char*)first->string, (unsigned char*)second->string, case_sensitive) < 0)
+        if (compare_strings((unsigned char*)first->string, (unsigned char*)second->string, false) < 0)
        {
            smaller = first;
        }
@@ -989,12 +988,6 @@ static int apply_patch(cJSON *object, const cJSON *patch, const cJSON_bool case_
        cJSON_AddItemToObject(parent, (char*)child_pointer, value);
        value = NULL;
    }
-    else /* parent is not an object */
-    {
-        /* Couldn't find object to add to. */
-        status = 9;
-        goto cleanup;
-    }

 cleanup:
    if (value != NULL)
--- a/cJSON_Utils.h
+++ b/cJSON_Utils.h
@@ -20,14 +20,6 @@
  THE SOFTWARE.
 */

-#ifndef cJSON_Utils__h
-#define cJSON_Utils__h
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #include "cJSON.h"

 /* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec. */
@@ -80,9 +72,3 @@ CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(const cJSON * const obje
 /* Sorts the members of the object into alphabetical order. */
 CJSON_PUBLIC(void) cJSONUtils_SortObject(cJSON * const object);
 CJSON_PUBLIC(void) cJSONUtils_SortObjectCaseSensitive(cJSON * const object);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/library_config/cJSONConfig.cmake.in
+++ b/library_config/cJSONConfig.cmake.in
@@ -2,8 +2,8 @@
 set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)

 # The include directories used by cJSON
-set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+set(CJSON_INCLUDE_DIRS "@prefix@/@includedir@")
+set(CJSON_INCLUDE_DIR "@prefix@/@includedir@")

 get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)

--- a/library_config/libcjson.pc.in
+++ b/library_config/libcjson.pc.in
@@ -1,10 +1,11 @@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=@prefix@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@

 Name: libcjson
-Version: @PROJECT_VERSION@
+Version: @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}
--- a/library_config/libcjson_utils.pc.in
+++ b/library_config/libcjson_utils.pc.in
@@ -1,8 +1,9 @@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+prefix=@prefix@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@

 Name: libcjson_utils
-Version: @PROJECT_VERSION@
+Version: @version@
 Description: An implementation of JSON Pointer, Patch and Merge Patch based on cJSON.
 URL: https://github.com/DaveGamble/cJSON
 Libs: -L${libdir} -lcjson_utils
--- a/test.c
+++ b/test.c
@@ -256,7 +256,7 @@ static void create_objects(void)
    cJSON_Delete(root);
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* print the version */
    printf("Version: %s\n", cJSON_Version());
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(ENABLE_CJSON_TEST)
-    add_library(unity STATIC unity/src/unity.c)
+    add_library(unity "${CJSON_LIBRARY_TYPE}" unity/src/unity.c)

    # Disable -Werror for Unity
    if (FLAG_SUPPORTED_Werror)
@@ -57,7 +57,6 @@ if(ENABLE_CJSON_TEST)
        compare_tests
        cjson_add
        readme_examples
-        minify_tests
    )

    option(ENABLE_VALGRIND OFF "Enable the valgrind memory checker for the tests.")
@@ -73,9 +72,6 @@ if(ENABLE_CJSON_TEST)

    foreach(unity_test ${unity_tests})
        add_executable("${unity_test}" "${unity_test}.c")
-        if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-            target_sources(${unity_test} PRIVATE unity_setup.c)
-        endif()
        target_link_libraries("${unity_test}" "${CJSON_LIB}" unity)
        if(MEMORYCHECK_COMMAND)
            add_test(NAME "${unity_test}"
--- a/tests/cjson_add.c
+++ b/tests/cjson_add.c
@@ -28,21 +28,15 @@
 #include "unity/src/unity.h"
 #include "common.h"

-static void * CJSON_CDECL failing_malloc(size_t size)
+static void *failing_malloc(size_t size)
 {
    (void)size;
    return NULL;
 }

-/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
-static void CJSON_CDECL normal_free(void *pointer)
-{
-    free(pointer);
-}
-
 static cJSON_Hooks failing_hooks = {
    failing_malloc,
-    normal_free
+    free
 };

 static void cjson_add_null_should_add_null(void)
@@ -378,7 +372,7 @@ static void cjson_add_array_should_fail_on_allocation_failure(void)
    cJSON_Delete(root);
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();

--- a/tests/compare_tests.c
+++ b/tests/compare_tests.c
@@ -186,7 +186,7 @@ static void cjson_compare_should_compare_objects(void)
                false))
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();

--- a/tests/json-patch-tests/cjson-utils-tests.json
+++ b/tests/json-patch-tests/cjson-utils-tests.json
@@ -80,12 +80,5 @@
 	"doc": { "foo": ["bar"] },
 	"patch": [ { "op": "add", "path": "/foo/-", "value": ["abc", "def"] }],
 	"expected": {"foo": ["bar", ["abc", "def"]] }
-    },
-
-    { 
-        "comment": "15",
-        "doc": {"foo": {"bar": 1}},
-        "patch": [{"op": "add", "path": "/foo/bar/baz", "value": "5"}],
-        "error": "attempting to add to subfield of non-object"
-    } 
+    }
 ]
--- a/tests/json-patch-tests/tests.json
+++ b/tests/json-patch-tests/tests.json
@@ -214,7 +214,6 @@

    { "doc": {"foo": null},
      "patch": [{"op": "test", "path": "/foo", "value": null}],
-      "expected": {"foo": null},
      "comment": "null value should be valid obj property" },

    { "doc": {"foo": null},
@@ -244,17 +243,14 @@

    { "doc": {"foo": {"foo": 1, "bar": 2}},
      "patch": [{"op": "test", "path": "/foo", "value": {"bar": 2, "foo": 1}}],
-      "expected": {"foo": {"foo": 1, "bar": 2}},
      "comment": "test should pass despite rearrangement" },

    { "doc": {"foo": [{"foo": 1, "bar": 2}]},
      "patch": [{"op": "test", "path": "/foo", "value": [{"bar": 2, "foo": 1}]}],
-      "expected": {"foo": [{"foo": 1, "bar": 2}]},
      "comment": "test should pass despite (nested) rearrangement" },

    { "doc": {"foo": {"bar": [1, 2, 5, 4]}},
      "patch": [{"op": "test", "path": "/foo", "value": {"bar": [1, 2, 5, 4]}}],
-      "expected": {"foo": {"bar": [1, 2, 5, 4]}},
      "comment": "test should pass - no error" },

    { "doc": {"foo": {"bar": [1, 2, 5, 4]}},
@@ -268,8 +264,7 @@

    { "comment": "Empty-string element",
      "doc": { "": 1 },
-      "patch": [{"op": "test", "path": "/", "value": 1}],
-      "expected": { "": 1 } },
+      "patch": [{"op": "test", "path": "/", "value": 1}] },

    { "doc": {
            "foo": ["bar", "baz"],
@@ -293,23 +288,8 @@
                {"op": "test", "path":  "/i\\j", "value": 5},
                {"op": "test", "path": "/k\"l", "value": 6},
                {"op": "test", "path": "/ ", "value": 7},
-                {"op": "test", "path": "/m~0n", "value": 8}],
-      "expected": {
-            "": 0,
-            " ": 7,
-            "a/b": 1,
-            "c%d": 2,
-            "e^f": 3,
-            "foo": [
-                "bar",
-                "baz"
-            ],
-            "g|h": 4,
-            "i\\j": 5,
-            "k\"l": 6,
-            "m~n": 8
-        }
-    },
+                {"op": "test", "path": "/m~0n", "value": 8}] },
+
    { "comment": "Move to same location has no effect",
      "doc": {"foo": 1},
      "patch": [{"op": "move", "from": "/foo", "path": "/foo"}],
@@ -408,21 +388,11 @@
      "patch": [ { "op": "copy", "path": "/-" } ],
      "error": "missing 'from' parameter" },

-    { "comment": "missing from location to copy",
-      "doc": { "foo": 1 },
-      "patch": [ { "op": "copy", "from": "/bar", "path": "/foo" } ],
-      "error": "missing 'from' location" },
-
    { "comment": "missing from parameter to move",
      "doc": { "foo": 1 },
      "patch": [ { "op": "move", "path": "" } ],
      "error": "missing 'from' parameter" },

-    { "comment": "missing from location to move",
-      "doc": { "foo": 1 },
-      "patch": [ { "op": "move", "from": "/bar", "path": "/foo" } ],
-      "error": "missing 'from' location" },
-
    { "comment": "duplicate ops",
      "doc": { "foo": "bar" },
      "patch": [ { "op": "add", "path": "/baz", "value": "qux",
--- a/tests/minify_tests.c
+++ b/tests/minify_tests.c
@@ -1,167 +0,0 @@
-/*
-  Copyright (c) 2009-2019 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "unity/examples/unity_config.h"
-#include "unity/src/unity.h"
-#include "common.h"
-
-
-static void cjson_minify_should_not_overflow_buffer(void)
-{
-    char unclosed_multiline_comment[] = "/* bla";
-    char pending_escape[] = "\"\\";
-
-    cJSON_Minify(unclosed_multiline_comment);
-    TEST_ASSERT_EQUAL_STRING("", unclosed_multiline_comment);
-
-    cJSON_Minify(pending_escape);
-    TEST_ASSERT_EQUAL_STRING("\"\\", pending_escape);
-}
-
-static void cjson_minify_should_remove_single_line_comments(void)
-{
-    const char to_minify[] = "{// this is {} \"some kind\" of [] comment /*, don't you see\n}";
-
-    char* minified = (char*) malloc(sizeof(to_minify));
-    TEST_ASSERT_NOT_NULL(minified);
-    strcpy(minified, to_minify);
-
-    cJSON_Minify(minified);
-    TEST_ASSERT_EQUAL_STRING("{}", minified);
-
-    free(minified);
-}
-
-static void cjson_minify_should_remove_spaces(void)
-{
-    const char to_minify[] = "{ \"key\":\ttrue\r\n    }";
-
-    char* minified = (char*) malloc(sizeof(to_minify));
-    TEST_ASSERT_NOT_NULL(minified);
-    strcpy(minified, to_minify);
-
-    cJSON_Minify(minified);
-    TEST_ASSERT_EQUAL_STRING("{\"key\":true}", minified);
-
-    free(minified);
-}
-
-static void cjson_minify_should_remove_multiline_comments(void)
-{
-    const char to_minify[] = "{/* this is\n a /* multi\n //line \n {comment \"\\\" */}";
-
-    char* minified = (char*) malloc(sizeof(to_minify));
-    TEST_ASSERT_NOT_NULL(minified);
-    strcpy(minified, to_minify);
-
-    cJSON_Minify(minified);
-    TEST_ASSERT_EQUAL_STRING("{}", minified);
-
-    free(minified);
-}
-
-static void cjson_minify_should_not_modify_strings(void)
-{
-    const char to_minify[] = "\"this is a string \\\" \\t bla\"";
-
-    char* minified = (char*) malloc(sizeof(to_minify));
-    TEST_ASSERT_NOT_NULL(minified);
-    strcpy(minified, to_minify);
-
-    cJSON_Minify(minified);
-    TEST_ASSERT_EQUAL_STRING(to_minify, minified);
-
-    free(minified);
-}
-
-static void cjson_minify_should_minify_json(void) {
-    const char to_minify[] =
-            "{\n"
-            "    \"glossary\": { // comment\n"
-            "        \"title\": \"example glossary\",\n"
-            "  /* multi\n"
-            " line */\n"
-            "		\"GlossDiv\": {\n"
-            "            \"title\": \"S\",\n"
-            "			\"GlossList\": {\n"
-            "                \"GlossEntry\": {\n"
-            "                    \"ID\": \"SGML\",\n"
-            "					\"SortAs\": \"SGML\",\n"
-            "					\"Acronym\": \"SGML\",\n"
-            "					\"Abbrev\": \"ISO 8879:1986\",\n"
-            "					\"GlossDef\": {\n"
-            "						\"GlossSeeAlso\": [\"GML\", \"XML\"]\n"
-            "                    },\n"
-            "					\"GlossSee\": \"markup\"\n"
-            "                }\n"
-            "            }\n"
-            "        }\n"
-            "    }\n"
-            "}";
-    const char* minified =
-            "{"
-            "\"glossary\":{"
-            "\"title\":\"example glossary\","
-            "\"GlossDiv\":{"
-            "\"title\":\"S\","
-            "\"GlossList\":{"
-            "\"GlossEntry\":{"
-            "\"ID\":\"SGML\","
-            "\"SortAs\":\"SGML\","
-            "\"Acronym\":\"SGML\","
-            "\"Abbrev\":\"ISO 8879:1986\","
-            "\"GlossDef\":{"
-            "\"GlossSeeAlso\":[\"GML\",\"XML\"]"
-            "},"
-            "\"GlossSee\":\"markup\""
-            "}"
-            "}"
-            "}"
-            "}"
-            "}";
-
-    char *buffer = (char*) malloc(sizeof(to_minify));
-    strcpy(buffer, to_minify);
-
-    cJSON_Minify(buffer);
-    TEST_ASSERT_EQUAL_STRING(minified, buffer);
-
-    free(buffer);
-}
-
-int CJSON_CDECL main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(cjson_minify_should_not_overflow_buffer);
-    RUN_TEST(cjson_minify_should_minify_json);
-    RUN_TEST(cjson_minify_should_remove_single_line_comments);
-    RUN_TEST(cjson_minify_should_remove_multiline_comments);
-    RUN_TEST(cjson_minify_should_remove_spaces);
-    RUN_TEST(cjson_minify_should_not_modify_strings);
-
-    return UNITY_END();
-}
--- a/tests/misc_tests.c
+++ b/tests/misc_tests.c
@@ -127,28 +127,6 @@ static void cjson_get_object_item_case_sensitive_should_get_object_items(void)
    cJSON_Delete(item);
 }

-static void cjson_get_object_item_should_not_crash_with_array(void) {
-    cJSON *array = NULL;
-    cJSON *found = NULL;
-    array = cJSON_Parse("[1]");
-
-    found = cJSON_GetObjectItem(array, "name");
-    TEST_ASSERT_NULL(found);
-
-    cJSON_Delete(array);
-}
-
-static void cjson_get_object_item_case_sensitive_should_not_crash_with_array(void) {
-    cJSON *array = NULL;
-    cJSON *found = NULL;
-    array = cJSON_Parse("[1]");
-
-    found = cJSON_GetObjectItemCaseSensitive(array, "name");
-    TEST_ASSERT_NULL(found);
-
-    cJSON_Delete(array);
-}
-
 static void typecheck_functions_should_check_type(void)
 {
    cJSON invalid[1];
@@ -432,7 +410,7 @@ static void cjson_functions_shouldnt_crash_with_null_pointers(void)
    cJSON_Delete(item);
 }

-static void * CJSON_CDECL failing_realloc(void *pointer, size_t size)
+static void *failing_realloc(void *pointer, size_t size)
 {
    (void)size;
    (void)pointer;
@@ -530,26 +508,7 @@ static void cjson_create_array_reference_should_create_an_array_reference(void)
    cJSON_Delete(number_reference);
 }

-static void cjson_add_item_to_object_should_not_use_after_free_when_string_is_aliased(void)
-{
-    cJSON *object = cJSON_CreateObject();
-    cJSON *number = cJSON_CreateNumber(42);
-    char *name = (char*)cJSON_strdup((const unsigned char*)"number", &global_hooks);
-
-    TEST_ASSERT_NOT_NULL(object);
-    TEST_ASSERT_NOT_NULL(number);
-    TEST_ASSERT_NOT_NULL(name);
-
-    number->string = name;
-
-    /* The following should not have a use after free
-     * that would show up in valgrind or with AddressSanitizer */
-    cJSON_AddItemToObject(object, number->string, number);
-
-    cJSON_Delete(object);
-}
-
-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();

@@ -557,8 +516,6 @@ int CJSON_CDECL main(void)
    RUN_TEST(cjson_array_foreach_should_not_dereference_null_pointer);
    RUN_TEST(cjson_get_object_item_should_get_object_items);
    RUN_TEST(cjson_get_object_item_case_sensitive_should_get_object_items);
-    RUN_TEST(cjson_get_object_item_should_not_crash_with_array);
-    RUN_TEST(cjson_get_object_item_case_sensitive_should_not_crash_with_array);
    RUN_TEST(typecheck_functions_should_check_type);
    RUN_TEST(cjson_should_not_parse_to_deeply_nested_jsons);
    RUN_TEST(cjson_set_number_value_should_set_numbers);
@@ -573,7 +530,6 @@ int CJSON_CDECL main(void)
    RUN_TEST(cjson_create_string_reference_should_create_a_string_reference);
    RUN_TEST(cjson_create_object_reference_should_create_an_object_reference);
    RUN_TEST(cjson_create_array_reference_should_create_an_array_reference);
-    RUN_TEST(cjson_add_item_to_object_should_not_use_after_free_when_string_is_aliased);

    return UNITY_END();
 }
--- a/tests/parse_array.c
+++ b/tests/parse_array.c
@@ -152,7 +152,7 @@ static void parse_array_should_not_parse_non_arrays(void)
    assert_not_array("\"[]hello world!\n\"");
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    memset(item, 0, sizeof(cJSON));
--- a/tests/parse_examples.c
+++ b/tests/parse_examples.c
@@ -195,7 +195,7 @@ static void test12_should_not_be_parsed(void)
    }
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();
    RUN_TEST(file_test1_should_be_parsed_and_printed);
--- a/tests/parse_hex4.c
+++ b/tests/parse_hex4.c
@@ -64,7 +64,7 @@ static void parse_hex4_should_parse_mixed_case(void)
    TEST_ASSERT_EQUAL_INT(0xBEEF, parse_hex4((const unsigned char*)"BEEF"));
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();
    RUN_TEST(parse_hex4_should_parse_all_combinations);
--- a/tests/parse_number.c
+++ b/tests/parse_number.c
@@ -96,7 +96,7 @@ static void parse_number_should_parse_negative_reals(void)
    assert_parse_number("-123e-128", 0, -123e-128);
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    memset(item, 0, sizeof(cJSON));
--- a/tests/parse_object.c
+++ b/tests/parse_object.c
@@ -162,7 +162,7 @@ static void parse_object_should_not_parse_non_objects(void)
    assert_not_object("\"{}hello world!\n\"");
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    memset(item, 0, sizeof(cJSON));
--- a/tests/parse_string.c
+++ b/tests/parse_string.c
@@ -119,7 +119,7 @@ static void parse_string_should_parse_bug_94(void)
    reset(item);
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item and error pointer */
    memset(item, 0, sizeof(cJSON));
--- a/tests/parse_value.c
+++ b/tests/parse_value.c
@@ -96,7 +96,7 @@ static void parse_value_should_parse_object(void)
    reset(item);
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    memset(item, 0, sizeof(cJSON));
--- a/tests/parse_with_opts.c
+++ b/tests/parse_with_opts.c
@@ -97,7 +97,7 @@ static void parse_with_opts_should_parse_utf8_bom(void)
    cJSON_Delete(without_bom);
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();

--- a/tests/print_array.c
+++ b/tests/print_array.c
@@ -87,7 +87,7 @@ static void print_array_should_print_arrays_with_multiple_elements(void)
    assert_print_array("[1, null, true, false, [], \"hello\", {\n\t}]", "[1,null,true,false,[],\"hello\",{}]");
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    UNITY_BEGIN();
--- a/tests/print_number.c
+++ b/tests/print_number.c
@@ -89,7 +89,7 @@ static void print_number_should_print_non_number(void)
    /* assert_print_number("null", -INFTY); */
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    UNITY_BEGIN();
--- a/tests/print_object.c
+++ b/tests/print_object.c
@@ -88,7 +88,7 @@ static void print_object_should_print_objects_with_multiple_elements(void)
    assert_print_object("{\n\t\"one\":\t1,\n\t\"NULL\":\tnull,\n\t\"TRUE\":\ttrue,\n\t\"FALSE\":\tfalse,\n\t\"array\":\t[],\n\t\"world\":\t\"hello\",\n\t\"object\":\t{\n\t}\n}", "{\"one\":1,\"NULL\":null,\"TRUE\":true,\"FALSE\":false,\"array\":[],\"world\":\"hello\",\"object\":{}}");
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    UNITY_BEGIN();
--- a/tests/print_string.c
+++ b/tests/print_string.c
@@ -65,7 +65,7 @@ static void print_string_should_print_utf8(void)
    assert_print_string("\"ü猫慕\"", "ü猫慕");
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    UNITY_BEGIN();
--- a/tests/print_value.c
+++ b/tests/print_value.c
@@ -90,7 +90,7 @@ static void print_value_should_print_object(void)
    assert_print_value("{}");
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    /* initialize cJSON item */
    UNITY_BEGIN();
--- a/tests/readme_examples.c
+++ b/tests/readme_examples.c
@@ -246,7 +246,7 @@ static void supports_full_hd_should_check_for_full_hd_support(void)
    TEST_ASSERT_FALSE(supports_full_hd(monitor_without_hd));
 }

-int CJSON_CDECL main(void)
+int main(void)
 {
    UNITY_BEGIN();

--- a/tests/unity_setup.c
+++ b/tests/unity_setup.c
@@ -1,3 +0,0 @@
-// msvc doesn't support weak-linking, so we need to define these functions.
-void setUp(void) { }
-void tearDown(void) { }
Author	SHA1	Message	Date
Max Bruckner	d48d988d7e	Use character literal to declare range of nonprintable characters.	2018-01-11 00:19:41 +01:00
Max Bruckner	15d9ec8b07	New macro static_strlen and replace magic numbers with it.	2018-01-10 17:43:25 +01:00
Max Bruckner	f07a3b7cb3	print_value: Use sizeof(literal) instead of magic numbers	2018-01-10 15:45:14 +01:00