[Scummvm-cvs-logs] scummvm master -> 060fafd6568c24d5cf1784b19541fc4c6ac19550

sev- sev at scummvm.org
Tue Jun 7 22:23:32 CEST 2016


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

Summary:
29154f1f20 SAGA: FUrther fix to potential buffer overflow
86d6a46fb6 SCI: Plug memory leak
060fafd656 JANITORIAL: Fix warning spelling


Commit: 29154f1f2089cbf553599521aa54ac94f452dcef
    https://github.com/scummvm/scummvm/commit/29154f1f2089cbf553599521aa54ac94f452dcef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-07T22:23:23+02:00

Commit Message:
SAGA: FUrther fix to potential buffer overflow

Changed paths:
    engines/saga/interface.cpp



diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 9a5e637..c663313 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1170,7 +1170,7 @@ void Interface::processStatusTextInput(Common::KeyState keystate) {
 		_statusTextInputPos--;
 		_statusTextInputString[_statusTextInputPos] = 0;
 	default:
-		if (_statusTextInputPos > STATUS_TEXT_INPUT_MAX - 1) { // -1 because of the null termination
+		if (_statusTextInputPos >= STATUS_TEXT_INPUT_MAX - 1) { // -1 because of the null termination
 			break;
 		}
 		if (Common::isAlnum(keystate.ascii) || (keystate.ascii == ' ')) {


Commit: 86d6a46fb65bbce1314277ac976f59ad373e3d9a
    https://github.com/scummvm/scummvm/commit/86d6a46fb65bbce1314277ac976f59ad373e3d9a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-07T22:23:23+02:00

Commit Message:
SCI: Plug memory leak

Changed paths:
    engines/sci/sound/drivers/amigamac.cpp



diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp
index 0f93b19..031fd321 100644
--- a/engines/sci/sound/drivers/amigamac.cpp
+++ b/engines/sci/sound/drivers/amigamac.cpp
@@ -773,6 +773,7 @@ bool MidiDriver_AmigaMac::loadInstrumentsSCI0(Common::File &file) {
 
 		if (id < 0 || id > 255) {
 			warning("Amiga/Mac driver: Error: instrument ID out of bounds");
+			delete instrument;
 			return false;
 		}
 


Commit: 060fafd6568c24d5cf1784b19541fc4c6ac19550
    https://github.com/scummvm/scummvm/commit/060fafd6568c24d5cf1784b19541fc4c6ac19550
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-07T22:23:23+02:00

Commit Message:
JANITORIAL: Fix warning spelling

Changed paths:
    engines/scumm/he/wiz_he.cpp



diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 68a983d..e55c3cb 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1816,11 +1816,10 @@ void Wiz::copy555WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
 	if (compID == 0x12340102) {
 		((ScummEngine_v100he *)_vm)->_moonbase->blitT14WizImage(dst, dstw, dsth, dstPitch, clipBox, wizd, srcx, srcy, rawROP, paramROP);
 	} else if (compID == 0x12340802) {
-		warning("Distorion codec");
+		warning("Distortion codec");
 	} else if (compID == 0x12340902) {
 		error("Unsupported Distortion");
 	}
-
 }
 
 #endif






More information about the Scummvm-git-logs mailing list