[Scummvm-git-logs] scummvm master -> 9467bf7faa89d21b81f415c352272e8de1f52302

[digitall]

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

Summary:
9467bf7faa SWORD1: Remove Fixed Sized Buffer Usage from Savegame Name Code


Commit: 9467bf7faa89d21b81f415c352272e8de1f52302
    https://github.com/scummvm/scummvm/commit/9467bf7faa89d21b81f415c352272e8de1f52302
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-15T00:28:28+01:00

Commit Message:
SWORD1: Remove Fixed Sized Buffer Usage from Savegame Name Code

Changed paths:
    engines/sword1/control.cpp


diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 0c53430..d385b2e 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -927,15 +927,15 @@ void Control::showSavegameNames() {
 		_buttons[cnt]->draw();
 		uint8 textMode = TEXT_LEFT_ALIGN;
 		uint16 ycoord = _saveButtons[cnt].y + 2;
-		uint8 str[40];
-		sprintf((char *)str, "%d. %s", cnt + _saveScrollPos + 1, _saveNames[cnt + _saveScrollPos].c_str());
+		Common::String savegameNameStr = Common::String::format("%d. %s", cnt + _saveScrollPos + 1, _saveNames[cnt + _saveScrollPos].c_str());
 		if (cnt + _saveScrollPos == _selectedSavegame) {
 			textMode |= TEXT_RED_FONT;
 			ycoord += 2;
-			if (_cursorVisible)
-				strcat((char *)str, "_");
+			if (_cursorVisible) {
+				savegameNameStr += "_";
+			}
 		}
-		renderText(str, _saveButtons[cnt].x + 6, ycoord, textMode);
+		renderText((const uint8*)savegameNameStr.c_str(), _saveButtons[cnt].x + 6, ycoord, textMode);
 	}
 }