UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-07 19:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c] Closes #696, leak in spine-c binary loader

Browse Source
This commit is contained in:
badlogic 2016-09-11 13:12:26 +02:00
parent 66a0421803
commit e3cdea94a0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-c/src/spine/SkeletonBinary.c
View File

@ -656,7 +656,11 @@ spAttachment* spSkeletonBinary_readAttachment(spSkeletonBinary* self, _dataInput
int i; int i;
spAttachmentType type; spAttachmentType type;
const char* name = readString(input); const char* name = readString(input);
if (!name) MALLOC_STR(name, attachmentName); int freeName = name != 0;
if (!name) {
freeName = 0;
MALLOC_STR(name, attachmentName);
}
type = (spAttachmentType)readByte(input); type = (spAttachmentType)readByte(input);
@ -680,6 +684,7 @@ spAttachment* spSkeletonBinary_readAttachment(spSkeletonBinary* self, _dataInput
readColor(input, &region->r, &region->g, &region->b, &region->a); readColor(input, &region->r, &region->g, &region->b, &region->a);
spRegionAttachment_updateOffset(region); spRegionAttachment_updateOffset(region);
spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment); spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment);
if (freeName) FREE(name);
return attachment; return attachment;
} }
case SP_ATTACHMENT_BOUNDING_BOX: { case SP_ATTACHMENT_BOUNDING_BOX: {
@ -689,6 +694,7 @@ spAttachment* spSkeletonBinary_readAttachment(spSkeletonBinary* self, _dataInput
_readVertices(self, input, SUB_CAST(spVertexAttachment, attachment), vertexCount); _readVertices(self, input, SUB_CAST(spVertexAttachment, attachment), vertexCount);
if (nonessential) readInt(input); /* Skip color. */ if (nonessential) readInt(input); /* Skip color. */
spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment); spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment);
if (freeName) FREE(name);
return attachment; return attachment;
} }
case SP_ATTACHMENT_MESH: { case SP_ATTACHMENT_MESH: {
@ -717,6 +723,7 @@ spAttachment* spSkeletonBinary_readAttachment(spSkeletonBinary* self, _dataInput
mesh->height = 0; mesh->height = 0;
} }
spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment); spAttachmentLoader_configureAttachment(self->attachmentLoader, attachment);
if (freeName) FREE(name);
return attachment; return attachment;
} }
case SP_ATTACHMENT_LINKED_MESH: { case SP_ATTACHMENT_LINKED_MESH: {
@ -738,6 +745,7 @@ spAttachment* spSkeletonBinary_readAttachment(spSkeletonBinary* self, _dataInput
mesh->height = readFloat(input) * self->scale; mesh->height = readFloat(input) * self->scale;
} }
_spSkeletonBinary_addLinkedMesh(self, mesh, skinName, slotIndex, parent); _spSkeletonBinary_addLinkedMesh(self, mesh, skinName, slotIndex, parent);
if (freeName) FREE(name);
return attachment; return attachment;
} }
case SP_ATTACHMENT_PATH: { case SP_ATTACHMENT_PATH: {
@ -755,10 +763,12 @@ spAttachment* spSkeletonBinary_readAttachment(spSkeletonBinary* self, _dataInput
path->lengths[i] = readFloat(input) * self->scale; path->lengths[i] = readFloat(input) * self->scale;
} }
if (nonessential) readInt(input); /* Skip color. */ if (nonessential) readInt(input); /* Skip color. */
if (freeName) FREE(name);
return attachment; return attachment;
} }
} }
if (freeName) FREE(name);
return 0; return 0;
} }