[Scummvm-cvs-logs] SF.net SVN: scummvm:[52147] scummvm/trunk/engines/kyra/sound_towns.cpp

sev at users.sourceforge.net sev at users.sourceforge.net
Tue Aug 17 13:00:53 CEST 2010


Revision: 52147
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52147&view=rev
Author:   sev
Date:     2010-08-17 11:00:53 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
KYRA: Fix array index out of bounds

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2010-08-17 11:00:29 UTC (rev 52146)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2010-08-17 11:00:53 UTC (rev 52147)
@@ -592,7 +592,7 @@
 
 	int h = 0;
 	if (_currentSFX) {
-		while (_mixer->isSoundHandleActive(_soundChannels[h]) && h < kNumChannelHandles)
+		while (h < kNumChannelHandles && _mixer->isSoundHandleActive(_soundChannels[h]))
 			h++;
 		if (h >= kNumChannelHandles)
 			return 0;


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