[Scummvm-cvs-logs] scummvm master -> 29bc36d0708f228f18ed7a75bcadb72fed9fb55a

[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:
29bc36d070 SCUMM: Fix initGM() buffer overflow (CID 1032513)


Commit: 29bc36d0708f228f18ed7a75bcadb72fed9fb55a
    https://github.com/scummvm/scummvm/commit/29bc36d0708f228f18ed7a75bcadb72fed9fb55a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-07-06T05:03:31-07:00

Commit Message:
SCUMM: Fix initGM() buffer overflow (CID 1032513)

We're clearly using 12 bytes, not 11.

Changed paths:
    engines/scumm/imuse/imuse.cpp



diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 12ebfef..7f771a0 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -1483,7 +1483,7 @@ void IMuseInternal::initMT32(MidiDriver *midi) {
 }
 
 void IMuseInternal::initGM(MidiDriver *midi) {
-	byte buffer[11];
+	byte buffer[12];
 	int i;
 
 	// General MIDI System On message
@@ -1540,7 +1540,7 @@ void IMuseInternal::initGM(MidiDriver *midi) {
 		// Set Channels 1-16 Reverb to 64, which is the
 		// equivalent of MT-32 default Reverb Level 5
 		for (i = 0; i < 16; ++i)
-			midi->send((64   << 16) | (91 << 8) | (0xB0 | i));
+			midi->send((64 << 16) | (91 << 8) | (0xB0 | i));
 		debug(2, "GM Controller 91 Change: Channels 1-16 Reverb Level is 64");
 
 		// Set Channels 1-16 Pitch Bend Sensitivity to