[Scummvm-cvs-logs] SF.net SVN: scummvm:[46676] scummvm/trunk/engines/agos/sound.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Dec 28 16:53:13 CET 2009
Revision: 46676
http://scummvm.svn.sourceforge.net/scummvm/?rev=46676&view=rev
Author: eriktorbjorn
Date: 2009-12-28 15:53:13 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
Create the stream dynamically in playSoundData(), to avoid a crash (spotted by
salty-horse) when makeWAVStream() deletes it.
Modified Paths:
--------------
scummvm/trunk/engines/agos/sound.cpp
Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp 2009-12-28 15:08:53 UTC (rev 46675)
+++ scummvm/trunk/engines/agos/sound.cpp 2009-12-28 15:53:13 UTC (rev 46676)
@@ -782,8 +782,8 @@
void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint sound, int pan, int vol, bool loop) {
int size = READ_LE_UINT32(soundData + 4);
- Common::MemoryReadStream stream(soundData, size);
- Audio::AudioStream *sndStream = Audio::makeWAVStream(&stream, true, loop);
+ Common::MemoryReadStream *stream = new Common::MemoryReadStream(soundData, size);
+ Audio::AudioStream *sndStream = Audio::makeWAVStream(stream, true, loop);
convertVolume(vol);
convertPan(pan);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list