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

[lordhoto]

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:
de0b5b62ab CINE: Let makeLoad take a Common::String as parameter.
c9bda09bc0 CINE: Prevent buffer overruns in scummVMSaveLoadDialog.


Commit: de0b5b62ab9171fc9839b7804a0f2b56fe0da9a9
    https://github.com/scummvm/scummvm/commit/de0b5b62ab9171fc9839b7804a0f2b56fe0da9a9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:35:43+01:00

Commit Message:
CINE: Let makeLoad take a Common::String as parameter.

Changed paths:
    engines/cine/cine.h
    engines/cine/saveload.cpp



diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 1618899..7c0191b 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -153,7 +153,7 @@ private:
 	bool makeLoad(const Common::String &saveName);
 	void makeSaveFW(Common::OutSaveFile &out);
 	void makeSaveOS(Common::OutSaveFile &out);
-	void makeSave(char *saveFileName);
+	void makeSave(const Common::String &saveFileName);
 	void mainLoop(int bootScriptIdx);
 	void readVolCnf();
 
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 907086a..1f4f286 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -969,7 +969,7 @@ void CineEngine::makeSaveOS(Common::OutSaveFile &out) {
 	saveBgIncrustList(out);
 }
 
-void CineEngine::makeSave(char *saveFileName) {
+void CineEngine::makeSave(const Common::String &saveFileName) {
 	Common::SharedPtr<Common::OutSaveFile> fHandle(_saveFileMan->openForSaving(saveFileName));
 
 	setMouseCursor(MOUSE_CURSOR_DISK);


Commit: c9bda09bc0900aac6d1cd96cd3f69b6a1761df70
    https://github.com/scummvm/scummvm/commit/c9bda09bc0900aac6d1cd96cd3f69b6a1761df70
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:36:24+01:00

Commit Message:
CINE: Prevent buffer overruns in scummVMSaveLoadDialog.

Changed paths:
    engines/cine/various.cpp



diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index fa05369..cd877a3 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -365,8 +365,7 @@ int CineEngine::scummVMSaveLoadDialog(bool isSave) {
 	if (slot < 0)
 		return true;
 
-	char saveFileName[256];
-	sprintf(saveFileName, "%s.%1d", _targetName.c_str(), slot);
+	Common::String saveFileName(Common::String::format("%s.%1d", _targetName.c_str(), slot));
 
 	if (isSave) {
 		Common::String tmp = Common::String::format("%s.dir", _targetName.c_str());