Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mismatched memory deallocators (#16596) 

* Fix mismatched memory deallocator in CCFastTMXLayer.cpp

* Fix mismatched memory deallocator on SkeletonRenderer.cpp

* Fix mismatched memory deallocator in CCTMXLayer.cpp
This commit is contained in:
Wilson E. Alvarez 2016-09-26 02:18:48 -04:00 committed by minggo
parent b22efc9115
commit 59574f95e0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCFastTMXLayer.cpp
View File

@ -130,7 +130,7 @@ TMXLayer::~TMXLayer()
{ {
CC_SAFE_RELEASE(_tileSet); CC_SAFE_RELEASE(_tileSet);
CC_SAFE_RELEASE(_texture); CC_SAFE_RELEASE(_texture);
CC_SAFE_DELETE_ARRAY(_tiles); CC_SAFE_FREE(_tiles);
CC_SAFE_RELEASE(_vData); CC_SAFE_RELEASE(_vData);
CC_SAFE_RELEASE(_vertexBuffer); CC_SAFE_RELEASE(_vertexBuffer);
CC_SAFE_RELEASE(_indexBuffer); CC_SAFE_RELEASE(_indexBuffer);

2
cocos/2d/CCTMXLayer.cpp
View File

@ -152,7 +152,7 @@ void TMXLayer::releaseMap()
{ {
if (_tiles) if (_tiles)
{ {
delete [] _tiles; free(_tiles);
_tiles = nullptr; _tiles = nullptr;
} }

2
cocos/editor-support/spine/SkeletonRenderer.cpp
View File

@ -98,7 +98,7 @@ SkeletonRenderer::~SkeletonRenderer () {
spSkeleton_dispose(_skeleton); spSkeleton_dispose(_skeleton);
if (_atlas) spAtlas_dispose(_atlas); if (_atlas) spAtlas_dispose(_atlas);
if (_attachmentLoader) spAttachmentLoader_dispose(_attachmentLoader); if (_attachmentLoader) spAttachmentLoader_dispose(_attachmentLoader);
delete _worldVertices; delete [] _worldVertices;
} }
void SkeletonRenderer::initWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) { void SkeletonRenderer::initWithData (spSkeletonData* skeletonData, bool ownsSkeletonData) {