[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv22898/sound

Modified Files:
	audiostream.cpp 
Log Message:
catch one potential problem, namely if eos is already reached when readBuffer is called ('This should never happen anyway', famous last words)

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- audiostream.cpp	4 Aug 2003 22:15:15 -0000	1.23
+++ audiostream.cpp	5 Aug 2003 00:31:00 -0000	1.24
@@ -70,7 +70,7 @@
 	}
 	int readBuffer(int16 *buffer, int numSamples) {
 		int samples = 0;
-		do {
+		while (samples < numSamples && !eosIntern()) {
 			const int len = MIN(numSamples, (_end - _ptr) / (is16Bit ? 2 : 1));
 			for (; samples < len; samples++) {
 				*buffer++ = readSample<is16Bit, isUnsigned>(_ptr);
@@ -80,7 +80,7 @@
 				_ptr = _loopPtr;
 				_end = _loopEnd;
 			}
-		} while (samples < numSamples && !eosIntern());
+		}
 		return samples;
 	}