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

Merge pull request #6201 from iSevenDays/patch-6 

Fix potential  memory leak in SimpleAudioEngine::preloadEffect
This commit is contained in:
James Chen 2014-04-10 09:37:12 +08:00
parent 2beed5d398 eb568998b2
commit a2fcc79ad0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/audio/openal/SimpleAudioEngineOpenAL.cpp
View File

@ -462,7 +462,7 @@ void SimpleAudioEngine::preloadEffect(const char* pszFilePath)
{ {
ALuint buffer = AL_NONE; ALuint buffer = AL_NONE;
ALuint source = AL_NONE; ALuint source = AL_NONE;
soundData *data = new soundData;
checkALError("preloadEffect:init"); checkALError("preloadEffect:init");
OpenALFile file; OpenALFile file;
@ -472,7 +472,7 @@ void SimpleAudioEngine::preloadEffect(const char* pszFilePath)
fprintf(stderr, "Cannot read file: '%s'\n", fullPath.data()); fprintf(stderr, "Cannot read file: '%s'\n", fullPath.data());
return; return;
} }
bool success = false; bool success = false;
const std::vector<OpenALDecoder *> &decoders = OpenALDecoder::getDecoders(); const std::vector<OpenALDecoder *> &decoders = OpenALDecoder::getDecoders();
for (size_t i = 0, n = decoders.size(); !success && i < n; ++i) for (size_t i = 0, n = decoders.size(); !success && i < n; ++i)
@ -489,7 +489,8 @@ void SimpleAudioEngine::preloadEffect(const char* pszFilePath)
alSourcei(source, AL_BUFFER, buffer); alSourcei(source, AL_BUFFER, buffer);
checkALError("preloadEffect:alSourcei"); checkALError("preloadEffect:alSourcei");
soundData *data = new soundData;
data->isLooped = false; data->isLooped = false;
data->buffer = buffer; data->buffer = buffer;
data->source = source; data->source = source;