CHEWY: Fix undefined behavior

scummvm · Oct 7, 2016 · 8df9eb5 · 8df9eb5
1 parent c3a4950
commit 8df9eb5
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/engines/chewy/resource.cpp b/engines/chewy/resource.cpp
@@ -251,10 +251,11 @@ SoundChunk *SoundResource::getSound(uint num) {
 	// Find the total length of the voice file
 	do {
 		blocksRemaining = _stream.readByte();
-		blockSize =
-			_stream.readByte() +
-			(_stream.readByte() << 8) +
-			(_stream.readByte() << 16);
+
+		byte b1 = _stream.readByte();
+		byte b2 = _stream.readByte();
+		byte b3 = _stream.readByte();
+		blockSize = b1 + (b2 << 8) + (b3 << 16);
 
 		totalLength += blockSize;
 		_stream.skip(blockSize);
@@ -269,10 +270,11 @@ SoundChunk *SoundResource::getSound(uint num) {
 
 	do {
 		blocksRemaining = _stream.readByte();
-		blockSize =
-			_stream.readByte() +
-			(_stream.readByte() << 8) +
-			(_stream.readByte() << 16);
+
+		byte b1 = _stream.readByte();
+		byte b2 = _stream.readByte();
+		byte b3 = _stream.readByte();
+		blockSize = b1 + (b2 << 8) + (b3 << 16);
 
 		_stream.read(ptr, blockSize);
 		ptr += blockSize;