[Scummvm-cvs-logs] scummvm master -> 263cc2873ba25ef896dc67aa7db574ee1f9c80b0

sev- sev at scummvm.org
Wed Jun 11 22:04:12 CEST 2014


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:
1d53333435 FULLPIPE: Copy string safely. CID 1208909
263cc2873b FULLPIPE: Use safe string copying. CID 1208908


Commit: 1d533334357b72d162bcf05e05d4cea37e17fbf4
    https://github.com/scummvm/scummvm/commit/1d533334357b72d162bcf05e05d4cea37e17fbf4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-11T23:01:22+03:00

Commit Message:
FULLPIPE: Copy string safely. CID 1208909

Changed paths:
    engines/fullpipe/sound.cpp



diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index 8e49954..8cbf780 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -286,7 +286,7 @@ void FullpipeEngine::setSceneMusicParameters(GameVar *gvar) {
 	if (seq) {
 		_sceneTrackHasSequence = true;
 
-		strcpy(_trackName, seq->_value.stringValue);
+		Common::strlcpy(_trackName, seq->_value.stringValue, 2600);
 	}
 
 	if (_musicLocal)


Commit: 263cc2873ba25ef896dc67aa7db574ee1f9c80b0
    https://github.com/scummvm/scummvm/commit/263cc2873ba25ef896dc67aa7db574ee1f9c80b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-11T23:02:58+03:00

Commit Message:
FULLPIPE: Use safe string copying. CID 1208908

Changed paths:
    engines/fullpipe/sound.cpp



diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index 8cbf780..a4ca06f 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -450,7 +450,7 @@ void FullpipeEngine::playTrack(GameVar *sceneVar, const char *name, bool delayed
 	if (seq) {
 		_sceneTrackHasSequence = true;
 
-		strcpy(_trackName, seq->_value.stringValue);
+		Common::strlcpy(_trackName, seq->_value.stringValue, 2600);
 	}
 
 	if (delayed) {






More information about the Scummvm-git-logs mailing list