[Scummvm-git-logs] scummvm master -> baf7c83e7d8b0ae21fba69d2135e1666e587e77b

sev- sev at scummvm.org
Mon Mar 27 08:04:30 CEST 2017


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:
b8a07d38d5 FULLPIPE: Safer string management
baf7c83e7d FULLPIPE: Sanity check on data loading


Commit: b8a07d38d534a43b5963b6586d47144a65206671
    https://github.com/scummvm/scummvm/commit/b8a07d38d534a43b5963b6586d47144a65206671
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-27T08:04:20+02:00

Commit Message:
FULLPIPE: Safer string management

Changed paths:
    engines/fullpipe/scene.cpp


diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index b5508da..74a824f 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -213,8 +213,8 @@ bool Scene::load(MfcArchive &file) {
 	if (_picObjList.size() > 0 && !_bgname.empty()) {
 		char fname[260];
 
-		strcpy(fname, _bgname.c_str());
-		strcpy(strrchr(fname, '.') + 1, "col");
+		Common::strlcpy(fname, _bgname.c_str(), 260);
+		Common::strlcpy(strrchr(fname, '.') + 1, "col", 260);
 
 		MemoryObject *col = new MemoryObject();
 		col->loadFile(fname);


Commit: baf7c83e7d8b0ae21fba69d2135e1666e587e77b
    https://github.com/scummvm/scummvm/commit/baf7c83e7d8b0ae21fba69d2135e1666e587e77b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-27T08:04:20+02:00

Commit Message:
FULLPIPE: Sanity check on data loading

Changed paths:
    engines/fullpipe/gfx.cpp


diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index c316f5f..7153ae7 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -587,6 +587,9 @@ void Picture::getDibInfo() {
 		warning("Picture::getDibInfo: data is empty <%s>", _memfilename.c_str());
 
 		MemoryObject::load();
+
+		if (!_data)
+			error("Picture::getDibInfo: error loading object #%d", _cnum);
 	}
 
 	Common::MemoryReadStream *s = new Common::MemoryReadStream(_data + off - 32, 32);





More information about the Scummvm-git-logs mailing list