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

SCI: correctly put NUL inside SegManager::strncpy() even when using n = 0xFFFFFFFFU

Browse Source 
svn-id: r50232
This commit is contained in:
Martin Kiewitz 2010-06-24 20:40:57 +00:00
parent e8d31ccc07
commit 893429d092
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sci/engine/seg_manager.cpp
View File

@ -649,14 +649,15 @@ void SegManager::strncpy(reg_t dest, const char* src, size_t n) {
::strncpy((char *)dest_r.raw, src, n);
} else {
// raw -> non-raw
for (uint i = 0; i < n; i++) {
uint i;
for (i = 0; i < n; i++) {
setChar(dest_r, i, src[i]);
if (!src[i])
break;
}
// Put an ending NUL to terminate the string
if ((size_t)dest_r.maxSize > n)
setChar(dest_r, n, 0);
if ((size_t)dest_r.maxSize > i)
setChar(dest_r, i, 0);
}
}