Release version 1.5.9

Fix error pointer behaviour of cJSON_ParseWithOpts()

.travis.yml

@@ -23,6 +23,6 @@ addons:
 script:
   - mkdir build
   - cd build
-  - cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_VALGRIND="${VALGRIND}" -DENABLE_SAFE_STACK="${VALGRIND}" -DENABLE_SANITIZERS="${SANITIZERS}"
+  - cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_VALGRIND="${VALGRIND}" -DENABLE_SANITIZERS="${SANITIZERS}"
   - make
   - make test CTEST_OUTPUT_ON_FAILURE=On

CHANGELOG.md

@@ -1,3 +1,18 @@
+1.5.9
+=====
+* Set the global error pointer even if `return_parse_end` is passed to `cJSON_ParseWithOpts`. See #200, thanks @rmallins
+
+1.5.8
+=====
+* Fix `make test` in the Makefile, thanks @YanhaoMo for reporting this (#195)
+
+1.5.7
+=====
+Fixes:
+------
+* Fix a bug where realloc failing would return a pointer to an invalid memory address. This is a security issue as it could potentially be used by an attacker to write to arbitrary memory addresses. (see #189), fixed in (954d61e5e7cb9dc6c480fc28ac1cdceca07dd5bd), big thanks @timothyjohncarney for reporting this issue
+* Fix a spelling mistake in the AFL fuzzer dictionary (#185), thanks @jwilk
+
 1.5.6
 =====
 Fixes:

CMakeLists.txt

@@ -7,7 +7,7 @@ project(cJSON C)
 
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MINOR 5)
-set(PROJECT_VERSION_PATCH 6)
+set(PROJECT_VERSION_PATCH 9)
 set(CJSON_VERSION_SO 1)
 set(CJSON_UTILS_VERSION_SO 1)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ -16,46 +16,33 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT
 set(custom_compiler_flags)
 
 include(CheckCCompilerFlag)
-option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags" ON)
+option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags for Clang and GCC" ON)
 if (ENABLE_CUSTOM_COMPILER_FLAGS)
-    if (("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU"))
+    list(APPEND custom_compiler_flags
-        list(APPEND custom_compiler_flags
+        -std=c89
-            -std=c89
+        -pedantic
-            -pedantic
+        -Wall
-            -Wall
+        -Wextra
-            -Wextra
+        -Werror
-            -Werror
+        -Wstrict-prototypes
-            -Wstrict-prototypes
+        -Wwrite-strings
-            -Wwrite-strings
+        -Wshadow
-            -Wshadow
+        -Winit-self
-            -Winit-self
+        -Wcast-align
-            -Wcast-align
+        -Wformat=2
-            -Wformat=2
+        -Wmissing-prototypes
-            -Wmissing-prototypes
+        -Wstrict-overflow=2
-            -Wstrict-overflow=2
+        -Wcast-qual
-            -Wcast-qual
+        -Wundef
-            -Wundef
+        -Wswitch-default
-            -Wswitch-default
+        -Wconversion
-            -Wconversion
+        -Wc++-compat
-            -Wc++-compat
+        -fstack-protector-strong
-            -fstack-protector-strong
+        -Wcomma
-            -Wcomma
+        -Wdouble-promotion
-            -Wdouble-promotion
+        -Wparentheses
-            -Wparentheses
+        -Wformat-overflow
-            -Wformat-overflow
-            -Wunused-macros
-            -Wmissing-variable-declarations
-            -Wused-but-marked-unused
-            -Wswitch-enum
         )
-    elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
-        list(APPEND custom_compiler_flags
-            /GS
-            /Za
-            /sdl
-            /W4
-        )
-    endif()
 endif()
 
 option(ENABLE_SANITIZERS "Enables AddressSanitizer and UndefinedBehaviorSanitizer." OFF)
@@ -73,16 +60,6 @@ if (ENABLE_SANITIZERS)
         )
 endif()
 
-option(ENABLE_SAFE_STACK "Enables the SafeStack instrumentation pass by the Code Pointer Integrity Project" OFF)
-if (ENABLE_SAFE_STACK)
-    if (ENABLE_SANITIZERS)
-        message(FATAL_ERROR "ENABLE_SAFE_STACK cannot be used in combination with ENABLE_SANITIZERS")
-    endif()
-    list(APPEND custom_compiler_flags
-        -fsanitize=safe-stack
-        )
-endif()
-
 option(ENABLE_PUBLIC_SYMBOLS "Export library symbols." On)
 if (ENABLE_PUBLIC_SYMBOLS)
     list(APPEND custom_compiler_flags -fvisibility=hidden)
@@ -122,17 +99,7 @@ set(CJSON_LIB cjson)
 file(GLOB HEADERS cJSON.h)
 set(SOURCES cJSON.c)
 
-option(BUILD_SHARED_AND_STATIC_LIBS "Build both shared and static libraries" Off)
+add_library("${CJSON_LIB}" "${HEADERS}" "${SOURCES}")
-
-if (NOT BUILD_SHARED_AND_STATIC_LIBS)
-    add_library("${CJSON_LIB}" "${HEADERS}" "${SOURCES}")
-else()
-    # See https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
-    add_library("${CJSON_LIB}" SHARED "${HEADERS}" "${SOURCES}")
-    add_library("${CJSON_LIB}-static" STATIC "${HEADERS}" "${SOURCES}")
-    set_target_properties("${CJSON_LIB}-static" PROPERTIES OUTPUT_NAME "${CJSON_LIB}")
-    set_target_properties("${CJSON_LIB}-static" PROPERTIES PREFIX "lib")
-endif()
 if (NOT WIN32)
     target_link_libraries("${CJSON_LIB}" m)
 endif()
@@ -143,9 +110,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
 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_LIBDIR}")
-endif()
 if(ENABLE_TARGET_EXPORT)
     # export library information for CMake projects
     install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
@@ -164,25 +128,13 @@ if(ENABLE_CJSON_UTILS)
     file(GLOB HEADERS_UTILS cJSON_Utils.h)
     set(SOURCES_UTILS cJSON_Utils.c)
 
-    if (NOT BUILD_SHARED_AND_STATIC_LIBS)
+    add_library("${CJSON_UTILS_LIB}" "${HEADERS_UTILS}" "${SOURCES_UTILS}")
-        add_library("${CJSON_UTILS_LIB}" "${HEADERS_UTILS}" "${SOURCES_UTILS}")
+    target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}")
-        target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}")
-    else()
-        add_library("${CJSON_UTILS_LIB}" SHARED "${HEADERS_UTILS}" "${SOURCES_UTILS}")
-        target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}")
-        add_library("${CJSON_UTILS_LIB}-static" STATIC "${HEADERS_UTILS}" "${SOURCES_UTILS}")
-        target_link_libraries("${CJSON_UTILS_LIB}-static" "${CJSON_LIB}-static")
-        set_target_properties("${CJSON_UTILS_LIB}-static" PROPERTIES OUTPUT_NAME "${CJSON_UTILS_LIB}")
-        set_target_properties("${CJSON_UTILS_LIB}-static" PROPERTIES PREFIX "lib")
-    endif()
 
     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_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
-    if (BUILD_SHARED_AND_STATIC_LIBS)
-        install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-    endif()
     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)

CONTRIBUTORS.md

@@ -15,6 +15,7 @@ Contributors
 * Ian Mobley
 * Irwan Djadjadi
 * [IvanVoid](https://github.com/npi3pak)
+* [Jakub Wilk](https://github.com/jwilk)
 * [Jiri Zouhar](https://github.com/loigu)
 * [Jonathan Fether](https://github.com/jfether)
 * [Julián Vásquez](https://github.com/juvasquezg)
@@ -29,6 +30,7 @@ Contributors
 * [Pawel Winogrodzki](https://github.com/PawelWMS)
 * [prefetchnta](https://github.com/prefetchnta)
 * [Rafael Leal Dias](https://github.com/rafaeldias)
+* [Robin Mallinson](https://github.com/rmallins)
 * [Rod Vagg](https://github.com/rvagg)
 * [Roland Meertens](https://github.com/rmeertens)
 * [Romain Porte](https://github.com/MicroJoe)

Makefile

@@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c
 
 LDLIBS = -lm
 
-LIBVERSION = 1.5.6
+LIBVERSION = 1.5.9
 CJSON_SOVERSION = 1
 UTILS_SOVERSION = 1
 
@@ -66,11 +66,10 @@ shared: $(CJSON_SHARED) $(UTILS_SHARED)
 
 static: $(CJSON_STATIC) $(UTILS_STATIC)
 
-tests: $(CJSON_TEST) $(UTILS_TEST)
+tests: $(CJSON_TEST)
 
 test: tests
 	./$(CJSON_TEST)
-	./$(UTILS_TEST)
 
 .c.o:
 	$(CC) -c $(R_CFLAGS) $<
@@ -150,4 +149,4 @@ clean:
 	$(RM) $(CJSON_OBJ) $(UTILS_OBJ) #delete object files
 	$(RM) $(CJSON_SHARED) $(CJSON_SHARED_VERSION) $(CJSON_SHARED_SO) $(CJSON_STATIC) #delete cJSON
 	$(RM) $(UTILS_SHARED) $(UTILS_SHARED_VERSION) $(UTILS_SHARED_SO) $(UTILS_STATIC) #delete cJSON_Utils
-	$(RM) $(CJSON_TEST) $(UTILS_TEST) #delete tests
+	$(RM) $(CJSON_TEST)  #delete test

README.md

@@ -85,12 +85,10 @@ You can change the build process with a list of different options that you can p
 * `-DENABLE_CJSON_TEST=On`: Enable building the tests. (on by default)
 * `-DENABLE_CJSON_UTILS=On`: Enable building cJSON_Utils. (off by default)
 * `-DENABLE_TARGET_EXPORT=On`: Enable the export of CMake targets. Turn off if it makes problems. (on by default)
-* `-DENABLE_CUSTOM_COMPILER_FLAGS=On`: Enable custom compiler flags (currently for Clang, GCC and MSVC). Turn off if it makes problems. (on by default)
+* `-DENABLE_CUSTOM_COMPILER_FLAGS=On`: Enable custom compiler flags (currently for Clang and GCC). Turn off if it makes problems. (on by default)
 * `-DENABLE_VALGRIND=On`: Run tests with [valgrind](http://valgrind.org). (off by default)
 * `-DENABLE_SANITIZERS=On`: Compile cJSON with [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) and [UndefinedBehaviorSanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html) enabled (if possible). (off by default)
-* `-DENABLE_SAFE_STACK`: Enable the [SafeStack](https://clang.llvm.org/docs/SafeStack.html) instrumentation pass. Currently only works with the Clang compiler. (off by default)
 * `-DBUILD_SHARED_LIBS=On`: Build the shared libraries. (on by default)
-* `-DBUILD_SHARED_AND_STATIC_LIBS=On`: Build both shared and static libraries. (off by default)
 * `-DCMAKE_INSTALL_PREFIX=/usr`: Set a prefix for the installation.
 
 If you are packaging cJSON for a distribution of Linux, you would probably take these steps for example:

appveyor.yml

@@ -1,82 +0,0 @@
-os: Visual Studio 2015
-
-# ENABLE_CUSTOM_COMPILER_FLAGS - on by default
-# ENABLE_SANITIZERS - off by default
-# ENABLE_PUBLIC_SYMBOLS - on by default
-# BUILD_SHARED_LIBS - on by default
-# ENABLE_TARGET_EXPORT - on by default
-# ENABLE_CJSON_UTILS - off by default
-# ENABLE_CJSON_TEST -on by default
-# ENABLE_VALGRIND - off by default
-# ENABLE_FUZZING - off by default
-
-environment:
-  matrix:
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-
-platform:
-  - x86
-  - x64
-
-configuration:
-  - Release
-
-
-build_script:
-  - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
-  - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST%  -H. -Bbuild
-  - cmake --build build --config "%CONFIGURATION%"
-
-
-on_failure:
-  - ps: if(Test-Path builds/CMakeFiles/CMakeOutput.log) { cat builds/CMakeFiles/CMakeOutput.log }
-  - ps: if(Test-Path builds/CMakeFiles/CMakeError.log) { cat builds/CMakeFiles/CMakeError.log }

cJSON.c

@@ -23,19 +23,9 @@
 /* cJSON */
 /* JSON parser in C. */
 
-/* disable warnings about old C89 functions in MSVC */
-#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
 #ifdef __GNUC__
 #pragma GCC visibility push(default)
 #endif
-#if defined(_MSC_VER)
-#pragma warning (push)
-/* disable warning about single line comments in system headers */
-#pragma warning (disable : 4001)
-#endif
 
 #include <string.h>
 #include <stdio.h>
@@ -46,9 +36,6 @@
 #include <ctype.h>
 #include <locale.h>
 
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
 #ifdef __GNUC__
 #pragma GCC visibility pop
 #endif
@@ -71,7 +58,7 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
 }
 
 /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
-#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 6)
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 9)
     #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
 #endif
 
@@ -114,27 +101,7 @@ typedef struct internal_hooks
     void *(*reallocate)(void *pointer, size_t size);
 } internal_hooks;
 
-#if defined(_MSC_VER)
+static internal_hooks global_hooks = { malloc, free, realloc };
-/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
-static void *internal_malloc(size_t size)
-{
-    return malloc(size);
-}
-static void internal_free(void *pointer)
-{
-    free(pointer);
-}
-static void *internal_realloc(void *pointer, size_t size)
-{
-    return realloc(pointer, size);
-}
-#else
-#define internal_malloc malloc
-#define internal_free free
-#define internal_realloc realloc
-#endif
-
-static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };
 
 static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
 {
@@ -147,8 +114,7 @@ static unsigned char* cJSON_strdup(const unsigned char* string, const internal_h
     }
 
     length = strlen((const char*)string) + sizeof("");
-    copy = (unsigned char*)hooks->allocate(length);
+    if (!(copy = (unsigned char*)hooks->allocate(length)))
-    if (copy == NULL)
     {
         return NULL;
     }
@@ -242,6 +208,7 @@ typedef struct
 
 /* check if the given size is left to read in a given parse buffer (starting with 1) */
 #define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
+#define cannot_read(buffer, size) (!can_read(buffer, size))
 /* check if the buffer can be accessed at the given index (starting with 0) */
 #define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
 #define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
@@ -410,6 +377,14 @@ static unsigned char* ensure(printbuffer * const p, size_t needed)
     {
         /* reallocate with realloc if available */
         newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
+        if (newbuffer == NULL)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
     }
     else
     {
@@ -958,22 +933,6 @@ static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
     return buffer;
 }
 
-/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
-static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
-{
-    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
-    {
-        return NULL;
-    }
-
-    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
-    {
-        buffer->offset += 3;
-    }
-
-    return buffer;
-}
-
 /* Parse an object - create a new root, and populate. */
 CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
 {
@@ -1000,7 +959,7 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
         goto fail;
     }
 
-    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
+    if (!parse_value(item, buffer_skip_whitespace(&buffer)))
     {
         /* parse failure. ep is set. */
         goto fail;
@@ -1047,10 +1006,8 @@ fail:
         {
             *return_parse_end = (const char*)local_error.json + local_error.position;
         }
-        else
+ 
-        {
+        global_error = local_error;
-            global_error = local_error;
-        }
     }
 
     return NULL;
@@ -1238,6 +1195,7 @@ static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buf
         return parse_object(item, input_buffer);
     }
 
+
     return false;
 }
 
@@ -1864,7 +1822,7 @@ CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSO
     item->type &= ~cJSON_StringIsConst;
 }
 
-#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
     #pragma GCC diagnostic push
 #endif
 #ifdef __GNUC__
@@ -1886,7 +1844,7 @@ CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJ
     item->type |= cJSON_StringIsConst;
     cJSON_AddItemToArray(object, item);
 }
-#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
     #pragma GCC diagnostic pop
 #endif
 

cJSON.h

@@ -31,7 +31,7 @@ extern "C"
 /* project version */
 #define CJSON_VERSION_MAJOR 1
 #define CJSON_VERSION_MINOR 5
-#define CJSON_VERSION_PATCH 6
+#define CJSON_VERSION_PATCH 9
 
 #include <stddef.h>
 
@@ -139,7 +139,7 @@ CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
 /* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
 CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
 /* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error. If not, then cJSON_GetErrorPtr() does the job. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
 CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
 
 /* Render a cJSON entity to text for transfer/storage. */

cJSON_Utils.c

@@ -20,32 +20,13 @@
   THE SOFTWARE.
 */
 
-/* disable warnings about old C89 functions in MSVC */
-#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-#ifdef __GNUCC__
 #pragma GCC visibility push(default)
-#endif
-#if defined(_MSC_VER)
-#pragma warning (push)
-/* disable warning about single line comments in system headers */
-#pragma warning (disable : 4001)
-#endif
-
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
-
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
-#ifdef __GNUCC__
 #pragma GCC visibility pop
-#endif
 
 #include "cJSON_Utils.h"
 

fuzzing/json.dict

@@ -25,8 +25,8 @@ escape_sequence_r="\\r"
 escape_sequence_t="\\t"
 escape_sequence_quote="\\\""
 escape_sequence_backslash="\\\\"
-escapce_sequence_slash="\\/"
+escape_sequence_slash="\\/"
-escpae_sequence_utf16_base="\\u"
+escape_sequence_utf16_base="\\u"
 escape_sequence_utf16="\\u12ab"
 
 number_integer="1"

tests/CMakeLists.txt

@@ -25,14 +25,6 @@ if(ENABLE_CJSON_TEST)
             target_compile_options(unity PRIVATE "-fno-sanitize=float-divide-by-zero")
         endif()
     endif()
-    # Disable -Wswitch-enum for Unity
-    if (FLAG_SUPPORTED_Wswitchenum)
-        if ("${CMAKE_VERSION}" VERSION_LESS "2.8.12")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-switch-enum")
-        else()
-            target_compile_options(unity PRIVATE "-Wno-switch-enum")
-        endif()
-    endif()
 
     #copy test files
     file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/inputs")
@@ -66,7 +58,7 @@ if(ENABLE_CJSON_TEST)
             message(WARNING "Valgrind couldn't be found.")
             unset(MEMORYCHECK_COMMAND)
         else()
-            set(MEMORYCHECK_COMMAND_OPTIONS --trace-children=yes --leak-check=full --error-exitcode=1)
+            set(MEMORYCHECK_COMMAND_OPTIONS --trace-children=yes --leak-check=full --error-exitcode=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../valgrind.supp)
         endif()
     endif()
 

tests/json_patch_tests.c

@@ -119,7 +119,7 @@ static cJSON_bool test_apply_patch(const cJSON * const test)
     return successful;
 }
 
-static cJSON_bool test_generate_test(cJSON *test)
+static cJSON_bool test_generate_test(cJSON *test __attribute__((unused)))
 {
     cJSON *doc = NULL;
     cJSON *patch = NULL;

tests/misc_tests.c

@@ -410,28 +410,20 @@ static void cjson_functions_shouldnt_crash_with_null_pointers(void)
     cJSON_Delete(item);
 }
 
-static void skip_utf8_bom_should_skip_bom(void)
+static void *failing_realloc(void *pointer, size_t size)
 {
-    const unsigned char string[] = "\xEF\xBB\xBF{}";
+    (void)size;
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    (void)pointer;
-    buffer.content = string;
+    return NULL;
-    buffer.length = sizeof(string);
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE(skip_utf8_bom(&buffer) == &buffer);
-    TEST_ASSERT_EQUAL_UINT(3U, (unsigned int)buffer.offset);
 }
 
-static void skip_utf8_bom_should_not_skip_bom_if_not_at_beginning(void)
+static void ensure_should_fail_on_failed_realloc(void)
 {
-    const unsigned char string[] = " \xEF\xBB\xBF{}";
+    printbuffer buffer = {NULL, 10, 0, 0, false, false, {&malloc, &free, &failing_realloc}};
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    buffer.buffer = (unsigned char*)malloc(100);
-    buffer.content = string;
+    TEST_ASSERT_NOT_NULL(buffer.buffer);
-    buffer.length = sizeof(string);
-    buffer.hooks = global_hooks;
-    buffer.offset = 1;
 
-    TEST_ASSERT_NULL(skip_utf8_bom(&buffer));
+    TEST_ASSERT_NULL_MESSAGE(ensure(&buffer, 200), "Ensure didn't fail with failing realloc.");
 }
 
 int main(void)
@@ -449,8 +441,6 @@ int main(void)
     RUN_TEST(cjson_replace_item_via_pointer_should_replace_items);
     RUN_TEST(cjson_replace_item_in_object_should_preserve_name);
     RUN_TEST(cjson_functions_shouldnt_crash_with_null_pointers);
-    RUN_TEST(skip_utf8_bom_should_skip_bom);
+    RUN_TEST(ensure_should_fail_on_failed_realloc);
-    RUN_TEST(skip_utf8_bom_should_not_skip_bom_if_not_at_beginning);
-
     return UNITY_END();
 }

tests/parse_examples.c

@@ -142,7 +142,7 @@ static void file_test6_should_not_be_parsed(void)
     tree = cJSON_Parse(test6);
     TEST_ASSERT_NULL_MESSAGE(tree, "Should fail to parse what is not JSON.");
 
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(test6, cJSON_GetErrorPtr(), "Error pointer is incorrect.");
+    TEST_ASSERT_EQUAL_PTR_MESSAGE(test6, cJSON_GetErrorPtr(), "Error pointer is incorrect.");
 
     if (test6 != NULL)
     {
@@ -179,6 +179,22 @@ static void file_test11_should_be_parsed_and_printed(void)
     do_test("test11");
 }
 
+static void test12_should_not_be_parsed(void)
+{
+    const char *test12 = "{ \"name\": ";
+    cJSON *tree = NULL;
+
+    tree = cJSON_Parse(test12);
+    TEST_ASSERT_NULL_MESSAGE(tree, "Should fail to parse incomplete JSON.");
+
+    TEST_ASSERT_EQUAL_PTR_MESSAGE(test12 + strlen(test12), cJSON_GetErrorPtr(), "Error pointer is incorrect.");
+
+    if (tree != NULL)
+    {
+        cJSON_Delete(tree);
+    }
+}
+
 int main(void)
 {
     UNITY_BEGIN();
@@ -193,5 +209,6 @@ int main(void)
     RUN_TEST(file_test9_should_be_parsed_and_printed);
     RUN_TEST(file_test10_should_be_parsed_and_printed);
     RUN_TEST(file_test11_should_be_parsed_and_printed);
+    RUN_TEST(test12_should_not_be_parsed);
     return UNITY_END();
 }

tests/parse_with_opts.c

@@ -40,11 +40,23 @@ static void parse_with_opts_should_handle_empty_strings(void)
 {
     const char empty_string[] = "";
     const char *error_pointer = NULL;
+
     TEST_ASSERT_NULL(cJSON_ParseWithOpts(empty_string, NULL, false));
-    error_pointer = cJSON_GetErrorPtr();
+    TEST_ASSERT_EQUAL_PTR(empty_string, cJSON_GetErrorPtr());
-    TEST_ASSERT_EQUAL_INT(0, error_pointer - empty_string);
+
     TEST_ASSERT_NULL(cJSON_ParseWithOpts(empty_string, &error_pointer, false));
-    TEST_ASSERT_EQUAL_INT(0, error_pointer - empty_string);
+    TEST_ASSERT_EQUAL_PTR(empty_string, error_pointer);
+    TEST_ASSERT_EQUAL_PTR(empty_string, cJSON_GetErrorPtr());
+}
+
+static void parse_with_opts_should_handle_incomplete_json(void)
+{
+    const char json[] = "{ \"name\": ";
+    const char *parse_end = NULL;
+
+    TEST_ASSERT_NULL(cJSON_ParseWithOpts(json, &parse_end, false));
+    TEST_ASSERT_EQUAL_PTR(json + strlen(json), parse_end);
+    TEST_ASSERT_EQUAL_PTR(json + strlen(json), cJSON_GetErrorPtr());
 }
 
 static void parse_with_opts_should_require_null_if_requested(void)
@@ -65,35 +77,19 @@ static void parse_with_opts_should_return_parse_end(void)
 
     cJSON *item = cJSON_ParseWithOpts(json, &parse_end, false);
     TEST_ASSERT_NOT_NULL(item);
-    TEST_ASSERT_EQUAL_INT(2, parse_end - json);
+    TEST_ASSERT_EQUAL_PTR(json + 2, parse_end);
     cJSON_Delete(item);
 }
 
-static void parse_with_opts_should_parse_utf8_bom(void)
-{
-    cJSON *with_bom = NULL;
-    cJSON *without_bom = NULL;
-
-    with_bom = cJSON_ParseWithOpts("\xEF\xBB\xBF{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(with_bom);
-    without_bom = cJSON_ParseWithOpts("{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(with_bom);
-
-    TEST_ASSERT_TRUE(cJSON_Compare(with_bom, without_bom, true));
-
-    cJSON_Delete(with_bom);
-    cJSON_Delete(without_bom);
-}
-
 int main(void)
 {
     UNITY_BEGIN();
 
     RUN_TEST(parse_with_opts_should_handle_null);
     RUN_TEST(parse_with_opts_should_handle_empty_strings);
+    RUN_TEST(parse_with_opts_should_handle_incomplete_json);
     RUN_TEST(parse_with_opts_should_require_null_if_requested);
     RUN_TEST(parse_with_opts_should_return_parse_end);
-    RUN_TEST(parse_with_opts_should_parse_utf8_bom);
 
     return UNITY_END();
 }

tests/print_number.c

@@ -49,16 +49,16 @@ static void print_number_should_print_zero(void)
 
 static void print_number_should_print_negative_integers(void)
 {
-    assert_print_number("-1", -1.0);
+    assert_print_number("-1", -1);
-    assert_print_number("-32768", -32768.0);
+    assert_print_number("-32768", -32768);
     assert_print_number("-2147483648", -2147483648.0);
 }
 
 static void print_number_should_print_positive_integers(void)
 {
-    assert_print_number("1", 1.0);
+    assert_print_number("1", 1);
-    assert_print_number("32767", 32767.0);
+    assert_print_number("32767", 32767);
-    assert_print_number("2147483647", 2147483647.0);
+    assert_print_number("2147483647", 2147483647);
 }
 
 static void print_number_should_print_positive_reals(void)
@@ -68,7 +68,6 @@ static void print_number_should_print_positive_reals(void)
     assert_print_number("1000000000000", 10e11);
     assert_print_number("1.23e+129", 123e+127);
     assert_print_number("1.23e-126", 123e-128);
-    assert_print_number("3.1415926535897931", 3.1415926535897931);
 }
 
 static void print_number_should_print_negative_reals(void)

valgrind.supp

@@ -0,0 +1,6 @@
+{
+	suppress_ld_on_armv7
+	Memcheck:Cond
+	...
+	obj:*/ld-*.so
+}