diff options
| author | Strangerke | 2014-05-31 01:24:28 +0200 |
|---|---|---|
| committer | Strangerke | 2014-05-31 01:35:32 +0200 |
| commit | 8cbee1509606986584625c669fc992f084036b76 (patch) | |
| tree | fd09b6cc8c6f168ff4ab0bfa5479eb576f1b282b /engines/cruise/sound.cpp | |
| parent | 3e9c1ea50a401ac27cbf0ea442d4e72c8087f902 (diff) | |
| download | scummvm-rg350-8cbee1509606986584625c669fc992f084036b76.tar.gz scummvm-rg350-8cbee1509606986584625c669fc992f084036b76.tar.bz2 scummvm-rg350-8cbee1509606986584625c669fc992f084036b76.zip | |
CRUISE: Add safeguards to avoid a buffer overflow in linker and sound
Diffstat (limited to 'engines/cruise/sound.cpp')
| -rw-r--r-- | engines/cruise/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp index 86146e3189..1441ae9661 100644 --- a/engines/cruise/sound.cpp +++ b/engines/cruise/sound.cpp @@ -630,7 +630,7 @@ bool PCSoundFxPlayer::load(const char *song) { stop(); } - strcpy(_musicName, song); + Common::strlcpy(_musicName, song, sizeof(_musicName)); _songPlayed = false; _looping = false; _sfxData = readBundleSoundFile(song); @@ -652,7 +652,7 @@ bool PCSoundFxPlayer::load(const char *song) { if (dot) { *dot = '\0'; } - strcat(instrument, _driver->getInstrumentExtension()); + Common::strlcat(instrument, _driver->getInstrumentExtension(), sizeof(instrument)); _instrumentsData[i] = readBundleSoundFile(instrument); if (!_instrumentsData[i]) { warning("Unable to load soundfx instrument '%s'", instrument); |