[Scummvm-cvs-logs] scummvm master -> 31e5b96fae452e7f4d71dedf8e4303887a971728

lordhoto lordhoto at gmail.com
Thu Nov 3 02:28:29 CET 2011


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

Summary:
3ad89a0d18 PARALLACTION: Fix memset size parameter.
31e5b96fae LASTEXPRESS: Fix read size parameter.


Commit: 3ad89a0d18f3cc1e20042288f37af99fedfabe0c
    https://github.com/scummvm/scummvm/commit/3ad89a0d18f3cc1e20042288f37af99fedfabe0c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-11-02T18:26:45-07:00

Commit Message:
PARALLACTION: Fix memset size parameter.

Changed paths:
    engines/parallaction/parallaction_br.cpp



diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index d850d40..658a8e8 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -289,7 +289,7 @@ void Parallaction_br::changeLocation() {
 
 		_disk->selectArchive(_partNames[_part]);
 
-		memset(_counters, 0, sizeof(*_counters));
+		memset(_counters, 0, sizeof(_counters));
 
 		_globalFlagsNames = _disk->loadTable("global");
 		_objectsNames = _disk->loadTable("objects");


Commit: 31e5b96fae452e7f4d71dedf8e4303887a971728
    https://github.com/scummvm/scummvm/commit/31e5b96fae452e7f4d71dedf8e4303887a971728
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-11-02T18:27:26-07:00

Commit Message:
LASTEXPRESS: Fix read size parameter.

Changed paths:
    engines/lastexpress/game/savegame.cpp



diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp
index e5b84ea..9c464fe 100644
--- a/engines/lastexpress/game/savegame.cpp
+++ b/engines/lastexpress/game/savegame.cpp
@@ -154,11 +154,11 @@ void SaveLoad::loadStream(GameId id) {
 		error("[SaveLoad::loadStream] Savegame stream is invalid");
 
 	// Load all savegame data
-	uint8* buf = new uint8[8192];
+	uint8 *buf = new uint8[8192];
 	while (!save->eos() && !save->err()) {
 		_engine->pollEvents();
 
-		uint32 count = save->read(buf, sizeof(*buf));
+		uint32 count = save->read(buf, 8192);
 		if (count) {
 			uint32 w = _savegame->write(buf, count);
 			assert (w == count);






More information about the Scummvm-git-logs mailing list