diff options
author | johndoe123 | 2013-04-18 19:08:22 +0200 |
---|---|---|
committer | johndoe123 | 2013-04-18 19:08:22 +0200 |
commit | 176a3babc553d1d6eb2a57fddb0a9665fc4aaa71 (patch) | |
tree | 239f044793de424c8ca50e739beab44b122609c6 /engines/sci/sound/drivers/midi.cpp | |
parent | e935f85366ba1e83fdd1cea3712959edee1f6270 (diff) | |
parent | 6c55213cd5a63ff198a25573ad38672e7faa02ce (diff) | |
download | scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.gz scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.tar.bz2 scummvm-rg350-176a3babc553d1d6eb2a57fddb0a9665fc4aaa71.zip |
Merge branch 'master' of github.com:scummvm/scummvm into sword25-gfx
Diffstat (limited to 'engines/sci/sound/drivers/midi.cpp')
-rw-r--r-- | engines/sci/sound/drivers/midi.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index a3d01753ff..a31d5f9a81 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -913,7 +913,8 @@ int MidiPlayer_Midi::open(ResourceManager *resMan) { if (res) { if (isMt32GmPatch(res->data, res->size)) { readMt32GmPatch(res->data, res->size); - strncpy((char *)_goodbyeMsg, " ScummVM ", 20); + // Note that _goodbyeMsg is not zero-terminated + memcpy(_goodbyeMsg, " ScummVM ", 20); } else { readMt32Patch(res->data, res->size); } |