libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: replace strncpy by strlcpy as suggested by LordHoto

Browse Source
This commit is contained in:
Strangerke 2013-10-30 21:34:24 +01:00
parent d9638677d2
commit 22df279adc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/toon/anim.cpp
View File

@ -41,7 +41,7 @@ bool Animation::loadAnimation(const Common::String &file) {
if (strncmp((char *)fileData, "KevinAguilar", 12))
return false;
strncpy(_name, file.c_str(), 32);
Common::strlcpy(_name, file.c_str(), 32);
uint32 headerSize = READ_LE_UINT32(fileData + 16);
uint32 uncompressedBytes = READ_LE_UINT32(fileData + 20);

6
engines/toon/script_func.cpp
View File

@ -1060,9 +1060,9 @@ int32 ScriptFunc::sys_Cmd_Set_Location_Data(EMCState *state) {
// initial setup of locations
int32 locationId = stackPos(0);
debugC(0, 0, "setlocationdata(%d) %s %x %s %s %d %d", locationId, GetText(1, state), stackPos(2), GetText(3, state), GetText(4, state), stackPos(5), stackPos(6));
strncpy(_vm->state()->_locations[locationId]._name, GetText(1, state), 64);
strncpy(_vm->state()->_locations[locationId]._music, GetText(3, state), 64);
strncpy(_vm->state()->_locations[locationId]._cutaway, GetText(4, state), 64);
Common::strlcpy(_vm->state()->_locations[locationId]._name, GetText(1, state), 64);
Common::strlcpy(_vm->state()->_locations[locationId]._music, GetText(3, state), 64);
Common::strlcpy(_vm->state()->_locations[locationId]._cutaway, GetText(4, state), 64);
_vm->state()->_locations[locationId]._flags = stackPos(2);
_vm->state()->_locations[locationId]._visited = false;
_vm->state()->_locations[locationId]._numSceneAnimations = stackPos(5);