Merge pull request #298 from pinguin999/master

Spine c-runtime struct definition & sfml memory access after free
This commit is contained in:
Nathan Sweet 2015-02-10 17:30:33 +01:00
commit 633e47920d
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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);
}