libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TUCKER: Don't allocate audio files on the stack

Browse Source
This commit is contained in:
SupSuper 2021-05-22 23:25:56 +01:00
parent 78ec256cca
commit 286ebbdec7
1 changed files with 9 additions and 6 deletions

15
engines/tucker/sequences.cpp

@ -603,14 +603,14 @@ Audio::RewindableAudioStream *AnimationSequencePlayer::loadSound(int index, Anim
return stream;
Common::String fileName = Common::String::format("audio/%s", _audioFileNamesTable[index]);
Common::File f;
if (f.open(fileName)) {
Common::File *f = new Common::File();
if (f->open(fileName)) {
int size = 0, rate = 0;
uint8 flags = 0;
switch (type) {
case kAnimationSoundType8BitsRAW:
case kAnimationSoundType16BitsRAW:
size = f.size();
size = f->size();
rate = 22050;
flags = Audio::FLAG_UNSIGNED;
if (type == kAnimationSoundType16BitsRAW)
@ -619,18 +619,21 @@ Audio::RewindableAudioStream *AnimationSequencePlayer::loadSound(int index, Anim
if (size != 0) {
uint8 *sampleData = (uint8 *)malloc(size);
if (sampleData) {
f.read(sampleData, size);
f->read(sampleData, size);
stream = Audio::makeRawStream(sampleData, size, rate, flags);
}
}
delete f;
break;
case kAnimationSoundTypeWAV:
stream = Audio::makeWAVStream(&f, DisposeAfterUse::NO);
stream = Audio::makeWAVStream(f, DisposeAfterUse::YES);
break;
default:
delete f;
break;
}
} else {
delete f;
}
return stream;
}