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

sev- sev at scummvm.org
Sun Apr 28 23:00:26 CEST 2013


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

Summary:
e37bcb8884 MADE: Null terminate string. CID 1003874
2a4bf37aab MOHAWK: Fix use after free. CID 1002114
e2cd02bb5e SAGA: Null terminate string. CID 1003868
aa8638db6a SAGA: Null terminate string. CID 1003870
759dc8e978 SAGA: Fix potentially unitialized pointer. CID 1003186, CID 1003187, CID 1003188, CID 1003189
0f9f268314 SAGA: Null terminate string. CID 1003869
a10ad272a8 SCUMM HE: Plug memory leak. CID 1003582
3263a5eda6 AUDIO: Fix identation. CID 1003641
6ca845b9ea LASTEXPRESS: Fix nasty bug with multiline macro. CID 1003640
18413bc0b3 LASTEXPRESS: Fix multiline macros. CID 1003638
717281734d TSAGE: Fixed nesting level. CID 1003637
30f78b3f4e TSAGE: Fixed nesting level. CID 1003636
bddd889058 TSAGE: Fix nexting level. CID 1003635
c5ba90f988 TSAGE: Fix nesting level. CID 1003634
ebf2ac5448 TSAGE: Fix nesting level. CID 1003633


Commit: e37bcb88842583fe696925b3e302bf2e329b228c
    https://github.com/scummvm/scummvm/commit/e37bcb88842583fe696925b3e302bf2e329b228c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
MADE: Null terminate string. CID 1003874

Changed paths:
    engines/made/database.cpp



diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 2b87f97..bf47164 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -694,7 +694,7 @@ int16 GameDatabaseV3::savegame(const char *filename, const char *description, in
 		warning("Can't create file '%s', game not saved", filename);
 		return 6;
 	}
-	strncpy(desc, description, 64);
+	Common::strlcpy(desc, description, 64);
 	out->writeUint32BE(MKTAG('S','G','A','M'));
 	out->writeUint32LE(size);
 	out->writeUint16LE(version);


Commit: 2a4bf37aab10dbc9d6d36e8e693c80574f60c884
    https://github.com/scummvm/scummvm/commit/2a4bf37aab10dbc9d6d36e8e693c80574f60c884
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
MOHAWK: Fix use after free. CID 1002114

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index a8b8c6a..f80dbfa 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -589,8 +589,8 @@ void MohawkEngine_LivingBooks::updatePage() {
 				_items.remove_at(i);
 				i--;
 				_orderedItems.remove(delayedEvent.item);
-				delete delayedEvent.item;
 				_page->itemDestroyed(delayedEvent.item);
+				delete delayedEvent.item;
 				if (_focus == delayedEvent.item)
 					_focus = NULL;
 				break;


Commit: e2cd02bb5ef0742220c50cbbf497e0a1b014f6b9
    https://github.com/scummvm/scummvm/commit/e2cd02bb5ef0742220c50cbbf497e0a1b014f6b9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
SAGA: Null terminate string. CID 1003868

Changed paths:
    engines/saga/interface.cpp



diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index a7bd7ed..6bc6313 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -2420,7 +2420,7 @@ bool Interface::converseAddText(const char *text, int strId, int replyId, byte r
 
 	assert(strlen(text) < CONVERSE_MAX_WORK_STRING);
 
-	strncpy(_converseWorkString, text, CONVERSE_MAX_WORK_STRING);
+	Common::strlcpy(_converseWorkString, text, CONVERSE_MAX_WORK_STRING);
 
 	while (1) {
 		len = strlen(_converseWorkString);


Commit: aa8638db6af81b1508c41700899553f01ed9fa1f
    https://github.com/scummvm/scummvm/commit/aa8638db6af81b1508c41700899553f01ed9fa1f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
SAGA: Null terminate string. CID 1003870

Changed paths:
    engines/saga/interface.cpp



diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 6bc6313..b105e34 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -723,7 +723,7 @@ void Interface::setStatusText(const char *text, int statusColor) {
 	if (_vm->_render->getFlags() & RF_MAP || _vm->_interface->getMode() == kPanelPlacard)
 		return;
 
-	strncpy(_statusText, text, STATUS_TEXT_LEN);
+	Common::strlcpy(_statusText, text, STATUS_TEXT_LEN);
 	_statusOnceColor = statusColor;
 	drawStatusBar();
 }


Commit: 759dc8e978a8fd26a79f0c121b059d531f5b1988
    https://github.com/scummvm/scummvm/commit/759dc8e978a8fd26a79f0c121b059d531f5b1988
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
SAGA: Fix potentially unitialized pointer. CID 1003186, CID 1003187, CID 1003188, CID 1003189

Changed paths:
    engines/saga/actor.cpp



diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp
index 06ce335..0548da9 100644
--- a/engines/saga/actor.cpp
+++ b/engines/saga/actor.cpp
@@ -1030,6 +1030,8 @@ bool Actor::getSpriteParams(CommonObjectData *commonObjectData, int &frameNumber
 	} else if (validObjId(commonObjectData->_id)) {
 		spriteList = &_vm->_sprite->_mainSprites;
 		frameNumber = commonObjectData->_spriteListResourceId;
+	} else {
+		return false;
 	}
 
 	if (spriteList->empty()) {


Commit: 0f9f2683142b0f6a371492e6cf6da8c6c3a51093
    https://github.com/scummvm/scummvm/commit/0f9f2683142b0f6a371492e6cf6da8c6c3a51093
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
SAGA: Null terminate string. CID 1003869

Changed paths:
    engines/saga/saveload.cpp



diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 3cd44eb..9784cf4 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -176,7 +176,7 @@ void SagaEngine::save(const char *fileName, const char *saveName) {
 	// Note that IHNM has a smaller save title size than ITE
 	// We allocate the ITE save title size here, to preserve
 	// savegame backwards compatibility
-	strncpy(_saveHeader.name, saveName, SAVE_TITLE_SIZE);
+	Common::strlcpy(_saveHeader.name, saveName, SAVE_TITLE_SIZE);
 
 	out->writeUint32BE(_saveHeader.type);
 	out->writeUint32LE(_saveHeader.size);


Commit: a10ad272a841a216e86148f566812d0177de8631
    https://github.com/scummvm/scummvm/commit/a10ad272a841a216e86148f566812d0177de8631
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
SCUMM HE: Plug memory leak. CID 1003582

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 798f703..e364105 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1548,12 +1548,16 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int maskNum, int maskState, int
 		if (rScreen.intersects(clip)) {
 			rScreen.clip(clip);
 		} else {
+			free(dst);
+
 			return 0;
 		}
 	} else if (_rectOverrideEnabled) {
 		if (rScreen.intersects(_rectOverride)) {
 			rScreen.clip(_rectOverride);
 		} else {
+			free(dst);
+
 			return 0;
 		}
 	}


Commit: 3263a5eda652f21f4910c3c07534289d8d3300af
    https://github.com/scummvm/scummvm/commit/3263a5eda652f21f4910c3c07534289d8d3300af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:20-07:00

Commit Message:
AUDIO: Fix identation. CID 1003641

Changed paths:
    audio/fmopl.cpp



diff --git a/audio/fmopl.cpp b/audio/fmopl.cpp
index da65564..d2fe7dc 100644
--- a/audio/fmopl.cpp
+++ b/audio/fmopl.cpp
@@ -137,7 +137,7 @@ OPL *Config::create(DriverId driver, OplType type) {
 			return new MAME::OPL();
 		else
 			warning("MAME OPL emulator only supports OPL2 emulation");
-			return 0;
+		return 0;
 
 #ifndef DISABLE_DOSBOX_OPL
 	case kDOSBox:


Commit: 6ca845b9ea0067b074f41a7b92d9d99a46d8fc82
    https://github.com/scummvm/scummvm/commit/6ca845b9ea0067b074f41a7b92d9d99a46d8fc82
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
LASTEXPRESS: Fix nasty bug with multiline macro. CID 1003640

Changed paths:
    engines/lastexpress/entities/august.cpp



diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp
index dbae7ba..b0bc073 100644
--- a/engines/lastexpress/entities/august.cpp
+++ b/engines/lastexpress/entities/august.cpp
@@ -3248,8 +3248,9 @@ IMPLEMENT_FUNCTION(63, August, function63)
 		break;
 
 	case kAction1:
-		if (getEntities()->isInSalon(kEntityAlexei))
+		if (getEntities()->isInSalon(kEntityAlexei)) {
 			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function44);
+		}
 
 		getData()->inventoryItem = kItemNone;
 


Commit: 18413bc0b3e02f40f3860e5b0ce8e4b593f72f0b
    https://github.com/scummvm/scummvm/commit/18413bc0b3e02f40f3860e5b0ce8e4b593f72f0b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
LASTEXPRESS: Fix multiline macros. CID 1003638

Changed paths:
    engines/lastexpress/entities/kahina.cpp



diff --git a/engines/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp
index 7860836..467c8d8 100644
--- a/engines/lastexpress/entities/kahina.cpp
+++ b/engines/lastexpress/entities/kahina.cpp
@@ -723,8 +723,9 @@ IMPLEMENT_FUNCTION_II(19, Kahina, function19, CarIndex, EntityPosition)
 		break;
 
 	case kActionNone:
-		if (getEvent(kEventAnnaBaggageArgument))
+		if (getEvent(kEventAnnaBaggageArgument)) {
 			RESET_ENTITY_STATE(kEntityKahina, Kahina, setup_function22);
+		}
 
 		if (getEntities()->updateEntity(kEntityKahina, (CarIndex)params->param1, (EntityPosition)params->param2))
 			callbackAction();


Commit: 717281734d49042c3f60c0b34fe60b3e6cb43e3e
    https://github.com/scummvm/scummvm/commit/717281734d49042c3f60c0b34fe60b3e6cb43e3e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
TSAGE: Fixed nesting level. CID 1003637

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 3a24645..82356ca 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1062,9 +1062,10 @@ void Scene1200::Area1::process(Event &event) {
 	CursorType cursor = R2_GLOBALS._events.getCursor();
 
 	if (_actor2._bounds.contains(event.mousePos.x + g_globals->gfxManager()._bounds.left , event.mousePos.y)) {
-		if (cursor == _cursorNum)
+		if (cursor == _cursorNum) {
 			warning("TODO: _cursorState = ???");
 			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+		}
 	} else if (event.mousePos.y < 168) {
 		if (cursor != _cursorNum) {
 			_savedCursorNum = cursor;


Commit: 30f78b3f4eb75f5a7d5652b19b8ace0e06b0b6ad
    https://github.com/scummvm/scummvm/commit/30f78b3f4eb75f5a7d5652b19b8ace0e06b0b6ad
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
TSAGE: Fixed nesting level. CID 1003636

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 82356ca..39a0483 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6931,9 +6931,10 @@ void Scene1550::UnkArea1550::process(Event &event) {
 	CursorType cursor = R2_GLOBALS._events.getCursor();
 
 	if (_areaActor._bounds.contains(event.mousePos.x + g_globals->gfxManager()._bounds.left , event.mousePos.y)) {
-		if (cursor == _cursorNum)
+		if (cursor == _cursorNum) {
 			warning("TODO: _cursorState = ???");
 			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+		}
 	} else if (event.mousePos.y < 168) {
 		if (cursor != _cursorNum) {
 			_savedCursorNum = cursor;


Commit: bddd88905816d30ad91acd6da063fda705897c90
    https://github.com/scummvm/scummvm/commit/bddd88905816d30ad91acd6da063fda705897c90
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
TSAGE: Fix nexting level. CID 1003635

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 39a0483..e12c8ef 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -8234,9 +8234,10 @@ void Scene1550::subA2B2F() {
 			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
 
 			if (varA == 0) {
-				if (_field417 != 1550)
+				if (_field417 != 1550) {
 					g_globals->_scenePalette.loadPalette(1550);
 					R2_GLOBALS._sceneManager._hasPalette = true;
+				}
 			} else {
 				g_globals->_scenePalette.loadPalette(varA);
 				R2_GLOBALS._sceneManager._hasPalette = true;


Commit: c5ba90f988327c95c8a1162d97a6c7ba4bf1622d
    https://github.com/scummvm/scummvm/commit/c5ba90f988327c95c8a1162d97a6c7ba4bf1622d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
TSAGE: Fix nesting level. CID 1003634

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e12c8ef..46003b5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -12954,9 +12954,10 @@ void Scene1950::Area1::process(Event &event) {
 	CursorType cursor = R2_GLOBALS._events.getCursor();
 
 	if (_areaActor._bounds.contains(event.mousePos.x + g_globals->gfxManager()._bounds.left , event.mousePos.y)) {
-		if (cursor == _cursorNum)
+		if (cursor == _cursorNum) {
 			warning("TODO: _cursorState = ???");
 			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+		}
 	} else if (event.mousePos.y < 168) {
 		if (cursor != _cursorNum) {
 			_savedCursorNum = cursor;


Commit: ebf2ac5448fd02cb2ed4c8beb7a3b27dbff1be53
    https://github.com/scummvm/scummvm/commit/ebf2ac5448fd02cb2ed4c8beb7a3b27dbff1be53
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-28T13:59:21-07:00

Commit Message:
TSAGE: Fix nesting level. CID 1003633

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 46003b5..af62ab6 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -14560,9 +14560,10 @@ void Scene1950::signal() {
 	case 1964:
 	// No break on purpose
 	case 1965:
-		if (!R2_GLOBALS.getFlag(37))
+		if (!R2_GLOBALS.getFlag(37)) {
 			SceneItem::display(1950, 26, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 			R2_GLOBALS._player.enableControl();
+		}
 		break;
 	case 1966:
 		_actor4.remove();






More information about the Scummvm-git-logs mailing list