Эх сурвалжийг харах

Merge pull request #298 from pinguin999/master

Spine c-runtime struct definition & sfml memory access after free
Nathan Sweet 10 жил өмнө
parent
commit
633e47920d

+ 1 - 1
spine-c/src/spine/Atlas.c

@@ -120,7 +120,7 @@ static int readValue (const char* end, Str* str) {
 /* Returns the number of tuple values read (1, 2, 4, or 0 for failure). */
 static int readTuple (const char* end, Str tuple[]) {
 	int i;
-	Str str;
+	Str str = {NULL, NULL};
 	readLine(0, end, &str);
 	if (!beginPast(&str, ':')) return 0;
 

+ 1 - 1
spine-sfml/src/spine/spine-sfml.cpp

@@ -81,8 +81,8 @@ SkeletonDrawable::SkeletonDrawable (SkeletonData* skeletonData, AnimationStateDa
 SkeletonDrawable::~SkeletonDrawable () {
 	delete vertexArray;
 	FREE(worldVertices);
+    if (ownsAnimationStateData) AnimationStateData_dispose(state->data);
 	AnimationState_dispose(state);
-	if (ownsAnimationStateData) AnimationStateData_dispose(state->data);
 	Skeleton_dispose(skeleton);
 }