From 095fe71ff8e8fda6752db179e78535c8bf0329e6 Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Thu, 2 Nov 2017 10:51:26 +0100
Subject: [PATCH 1/2] [cocos2dx] Updated to cocos2d-x 3.16.

---
 spine-cocos2dx/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spine-cocos2dx/CMakeLists.txt b/spine-cocos2dx/CMakeLists.txt
index 55886d048..028103e07 100644
--- a/spine-cocos2dx/CMakeLists.txt
+++ b/spine-cocos2dx/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 2.8)
 set(EXAMPLE_DIR "${CMAKE_CURRENT_LIST_DIR}/example")
 if (NOT EXISTS ${EXAMPLE_DIR}/cocos2d)
 	message("Downloading cocos2dx, this may take some time!")
-	file(DOWNLOAD "http://www.cocos2d-x.org/filedown/start/364" "${EXAMPLE_DIR}/cocos2dx.zip")
+	file(DOWNLOAD "http://cdn.cocos2d-x.org/cocos2d-x-3.16.zip" "${EXAMPLE_DIR}/cocos2dx.zip")
 	execute_process(
 		COMMAND ${CMAKE_COMMAND} -E tar x  ${EXAMPLE_DIR}/cocos2dx.zip
 		WORKING_DIRECTORY ${EXAMPLE_DIR}
     )
     execute_process(
     	COMMAND ${CMAKE_COMMAND} -E rename
-        "${EXAMPLE_DIR}/cocos2d-x-3.14.1" "${EXAMPLE_DIR}/cocos2d"
+        "${EXAMPLE_DIR}/cocos2d-x-3.16" "${EXAMPLE_DIR}/cocos2d"
     )
     execute_process(
     	COMMAND ${CMAKE_COMMAND} -E remove_directory "${EXAMPLE_DIR}/cocos2d/cocos/editor-support/spine"

From 361378b2750841955e0643d66594abe46d81e90d Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Thu, 2 Nov 2017 11:20:57 +0100
Subject: [PATCH 2/2] [c] Error in color parsing, off-by-one resulting in
 invalid memory access. Closes #1031. Thanks @minggo for the adress sanitizer
 hint.

---
 spine-c/spine-c/src/spine/SkeletonJson.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c
index 48322bad5..b67e94bdf 100644
--- a/spine-c/spine-c/src/spine/SkeletonJson.c
+++ b/spine-c/spine-c/src/spine/SkeletonJson.c
@@ -93,7 +93,8 @@ static float toColor (const char* value, int index) {
 	char *error;
 	int color;
 
-	if (strlen(value) / 2 < index) return -1;
+	if (index >= strlen(value) / 2)
+		return -1;
 	value += index * 2;
 
 	digits[0] = *value;