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

SCI: Fix malloc<->new mismatch in SysStrings, try to increase readability

Browse Source 
svn-id: r49375
This commit is contained in:
Max Horn 2010-06-01 15:38:34 +00:00
parent caf1a6bee4
commit 1f54cdf90d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/sci/engine/kernel32.cpp
View File

@ -577,14 +577,14 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
// We have a special case here for argv[1] being a system string
if (argv[1].segment == s->_segMan->getSysStringsSegment()) {
// Resize if necessary
if ((uint32)s->_segMan->sysStrings->_strings[argv[1].toUint16()]._maxSize < index1 + count) {
delete[] s->_segMan->sysStrings->_strings[argv[1].toUint16()]._value;
s->_segMan->sysStrings->_strings[argv[1].toUint16()]._maxSize = index1 + count;
s->_segMan->sysStrings->_strings[argv[1].toUint16()]._value = new char[index1 + count];
memset(s->_segMan->sysStrings->_strings[argv[1].toUint16()]._value, 0, index1 + count);
const uint16 sysStringId = argv[1].toUint16();
if ((uint32)s->_segMan->sysStrings->_strings[sysStringId]._maxSize < index1 + count) {
free(s->_segMan->sysStrings->_strings[sysStringId]._value);
s->_segMan->sysStrings->_strings[sysStringId]._maxSize = index1 + count;
s->_segMan->sysStrings->_strings[sysStringId]._value = (char *)calloc(index1 + count, sizeof(char));
}
strncpy(s->_segMan->sysStrings->_strings[argv[1].toUint16()]._value + index1, string2.c_str() + index2, count);
strncpy(s->_segMan->sysStrings->_strings[sysStringId]._value + index1, string2.c_str() + index2, count);
} else {
SciString *string1 = s->_segMan->lookupString(argv[1]);