From af74f72fd28982c1e6e1dd50c8bf214616481610 Mon Sep 17 00:00:00 2001
From: Heikki Hannikainen <hessu@hes.iki.fi>
Date: Mon, 27 Feb 2017 09:24:48 +0200
Subject: [PATCH] Bumping cJSON to 1.3.1

---
 src/cJSON.c | 7 ++++---
 src/cJSON.h | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cJSON.c b/src/cJSON.c
index c3d1a4e..b3f84fd 100644
--- a/src/cJSON.c
+++ b/src/cJSON.c
@@ -45,7 +45,7 @@ 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 != 3) || (CJSON_VERSION_PATCH != 0)
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 3) || (CJSON_VERSION_PATCH != 1)
     #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
 #endif
 
@@ -422,8 +422,6 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
     unsigned char utf8_length = 0;
     unsigned char sequence_length = 0;
 
-    /* get the first utf16 sequence */
-    first_code = parse_hex4(first_sequence + 2);
     if ((input_end - first_sequence) < 6)
     {
         /* input ends unexpectedly */
@@ -431,6 +429,9 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
         goto fail;
     }
 
+    /* get the first utf16 sequence */
+    first_code = parse_hex4(first_sequence + 2);
+
     /* check that the code is valid */
     if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)) || (first_code == 0))
     {
diff --git a/src/cJSON.h b/src/cJSON.h
index e4a7856..b8e0884 100644
--- a/src/cJSON.h
+++ b/src/cJSON.h
@@ -31,7 +31,7 @@ extern "C"
 /* project version */
 #define CJSON_VERSION_MAJOR 1
 #define CJSON_VERSION_MINOR 3
-#define CJSON_VERSION_PATCH 0
+#define CJSON_VERSION_PATCH 1
 
 /* returns the version of cJSON as a string */
 extern const char* cJSON_Version(void);