From 9f5deac729270ff7ce7635f26faadb0946044bc4 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 27 May 2024 09:00:41 +0200 Subject: [PATCH 1/3] [c] Assume C99 compatibility. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02009e22f..a1da43e09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if(MSVC) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") else() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-value -Wno-variadic-macros -Wextra -pedantic -Wshadow -std=c89") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-value -Wno-variadic-macros -Wextra -pedantic -Wshadow -std=c99") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-value -Wno-variadic-macros -Wextra -Wnon-virtual-dtor -pedantic -Wshadow -std=c++11 -fno-exceptions -fno-rtti") if (${SPINE_SANITIZE}) From 01fb5643582195af08d08ab2e770e8db21aa901f Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 27 May 2024 09:04:13 +0200 Subject: [PATCH 2/3] [sdl] Update to SDL 2.30.2 --- spine-sdl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-sdl/CMakeLists.txt b/spine-sdl/CMakeLists.txt index b2ada59fb..7e2b67b03 100644 --- a/spine-sdl/CMakeLists.txt +++ b/spine-sdl/CMakeLists.txt @@ -10,7 +10,7 @@ else() endif() include(FetchContent) -FetchContent_Declare(SDL GIT_REPOSITORY https://github.com/libsdl-org/SDL GIT_TAG release-2.0.22) +FetchContent_Declare(SDL GIT_REPOSITORY https://github.com/libsdl-org/SDL GIT_TAG release-2.30.2) FetchContent_MakeAvailable(SDL) include_directories(src) From d344c148ae613a0c05f682a5d741acf473585727 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 27 May 2024 12:48:46 +0200 Subject: [PATCH 3/3] [cpp] Return error when default skin can not be parsed in SkeletonBinary. --- spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index a19463515..978a42130 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -274,6 +274,12 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons skeletonData->_skins.add(defaultSkin); } + if (!this->getError().isEmpty()) { + delete input; + delete skeletonData; + return NULL; + } + /* Skins. */ for (size_t i = 0, n = (size_t) readVarint(input, true); i < n; ++i) { Skin *skin = readSkin(input, false, skeletonData, nonessential);