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

bluegr noreply at scummvm.org
Tue Jul 2 04:36:27 UTC 2024


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

Summary:
b3061e0bc6 GOB: fix code overloads in map_v1.cpp
43df893264 GOB: remove empty comment line
e1f2a52fe6 GOB: fix overload in hotspots.cpp


Commit: b3061e0bc622897ce7f9fa208179b5a0706002bb
    https://github.com/scummvm/scummvm/commit/b3061e0bc622897ce7f9fa208179b5a0706002bb
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-02T07:36:23+03:00

Commit Message:
GOB: fix code overloads in map_v1.cpp

Changed paths:
    engines/gob/map_v1.cpp


diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp
index 1e98a3711b6..bb6c74bc0e6 100644
--- a/engines/gob/map_v1.cpp
+++ b/engines/gob/map_v1.cpp
@@ -72,7 +72,7 @@ void Map_v1::loadMapObjects(const char *avjFile) {
 	uint32 objsPos;
 
 	Common::strcpy_s(avoName, sizeof(avoName) - 4, _sourceFile);
-	Common::strcat_s(avoName, ".avo");
+	Common::strcat_s(avoName, sizeof(avoName), ".avo");
 
 	int32 size;
 	dataBuf = _vm->_dataIO->getFile(avoName, size);
@@ -157,8 +157,8 @@ void Map_v1::loadSounds(Common::SeekableReadStream &data) {
 	for (int i = 0; i < count; i++) {
 		data.read(buf, 14);
 		buf[14] = 0;
-		Common::strcat_s(buf, ".SND");
-		Common::strcpy_s(sndNames[i], buf);
+		Common::strcat_s(buf, sizeof(buf), ".SND");
+		Common::strcpy_s(sndNames[i], sizeof(sndNames[i]), buf);
 	}
 
 	_vm->_sound->sampleLoad(&_vm->_goblin->_soundData[14], SOUND_SND, "diamant1.snd");


Commit: 43df893264e55d99b38ba45af42b56ebab350e8a
    https://github.com/scummvm/scummvm/commit/43df893264e55d99b38ba45af42b56ebab350e8a
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-02T07:36:23+03:00

Commit Message:
GOB: remove empty comment line

Changed paths:
    engines/gob/sound/cdrom.cpp


diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index dc162b88d34..0918d6c3a02 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -118,7 +118,6 @@ void CDROM::startTrack(const char *trackName) {
 
 void CDROM::play(uint32 from, uint32 to) {
 	// play from sector [from] to sector [to]
-	//
 	// format is HSG:
 	// HSG encodes frame information into a double word:
 	// minute multiplied by 4500, plus second multiplied by 75,


Commit: e1f2a52fe67a11213bee54fbec236c376f7b50e9
    https://github.com/scummvm/scummvm/commit/e1f2a52fe67a11213bee54fbec236c376f7b50e9
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-02T07:36:23+03:00

Commit Message:
GOB: fix overload in hotspots.cpp

Changed paths:
    engines/gob/hotspots.cpp


diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index 6c7b050bab8..7fb18685b46 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -934,7 +934,7 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 	while (1) {
 		// If we the edit field has enough space, add a space for the new character
 		Common::strlcpy(tempStr, str, 255);
-		Common::strcat_s(tempStr, " ");
+    	Common::strcat_s(tempStr, sizeof(tempStr), " ");
 		if ((editSize != 0) && strlen(tempStr) > editSize)
 			Common::strlcpy(tempStr, str, 256);
 




More information about the Scummvm-git-logs mailing list