[Scummvm-cvs-logs] CVS: residual/imuse imuse_sndmgr.cpp,1.7,1.8
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Jan 1 03:19:03 CET 2005
Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10513
Modified Files:
imuse_sndmgr.cpp
Log Message:
check before free
Index: imuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_sndmgr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- imuse_sndmgr.cpp 1 Jan 2005 10:23:16 -0000 1.7
+++ imuse_sndmgr.cpp 1 Jan 2005 11:18:34 -0000 1.8
@@ -195,11 +195,20 @@
void ImuseSndMgr::closeSound(SoundStruct *soundHandle) {
assert(checkForProperHandle(soundHandle));
- if (soundHandle->mcmpMgr)
+ if (soundHandle->mcmpMgr) {
delete soundHandle->mcmpMgr;
+ soundHandle->mcmpMgr = NULL;
+ }
- free(soundHandle->region);
- free(soundHandle->jump);
+ if (soundHandle->region) {
+ free(soundHandle->region);
+ soundHandle->region = NULL;
+ }
+
+ if (soundHandle->jump) {
+ free(soundHandle->jump);
+ soundHandle->jump = NULL;
+ }
memset(soundHandle, 0, sizeof(SoundStruct));
}
More information about the Scummvm-git-logs
mailing list