hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-04 16:51:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes a potential leak: sampleString not always freed

Browse source
This commit is contained in:
Mathias Buhr 2017-04-23 22:04:09 +02:00 • committed by Harry van Haaren
parent da42a86ad9
commit ca0e50a36a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/diskreader.cxx
View file

@ -282,13 +282,14 @@ int DiskReader::loadSample( int track, int scene, string path )
if ( file_length > 0 ) {
sampleFile.seekg(0, std::ios_base::beg);
sampleFile.clear();
char *sampleString = new char[file_length];
sampleFile.read(sampleString, file_length);
std::vector<char> sampleString(file_length + 1);
sampleFile.read(sampleString.data(), file_length);
sampleString.back() = '\0';
//cout << "Sample file:" << endl << sampleString << endl;
//cout << "Sample file (parsed):" << endl << cJSON_Parse( sampleString ) << endl;
cJSON* audioJson = cJSON_Parse( sampleString );
cJSON* audioJson = cJSON_Parse( sampleString.data() );
if (!audioJson) {
LUPPP_ERROR("%s %s","Error in Sample JSON before: ", cJSON_GetErrorPtr() );
return LUPPP_RETURN_ERROR;
@ -323,7 +324,6 @@ int DiskReader::loadSample( int track, int scene, string path )
}
cJSON_Delete( audioJson );
delete[] sampleString;
} else {
// this means there's no audio.cfg file found for the sample: show the user
// the file, and ask what the intended beat number is, and load the AudioBuffer