[Scummvm-cvs-logs] scummvm master -> ba3172b55f0b2bc2ebae1cb90804714e44d60c6f

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ba3172b55f NEVERHOOD: Fix crash when playing uncompressed sounds


Commit: ba3172b55f0b2bc2ebae1cb90804714e44d60c6f
    https://github.com/scummvm/scummvm/commit/ba3172b55f0b2bc2ebae1cb90804714e44d60c6f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-12-28T05:21:48-08:00

Commit Message:
NEVERHOOD: Fix crash when playing uncompressed sounds

This happened to me when (or shortly afterwards; I'm not quite sure)
lighting the fuse on the TNT dummy.

Changed paths:
    engines/neverhood/sound.cpp



diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index 4946de1..6888cc5 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -560,7 +560,7 @@ int NeverhoodAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 			}
 		} else {
 			memcpy(buffer, _buffer, bytesRead);
-			buffer += bytesRead;
+			buffer += samplesRead;
 		}
 
 		if (bytesRead < bytesToRead || _stream->pos() >= _stream->size() || _stream->err() || _stream->eos()) {