Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10453) -Codechange: Allow save/load of empty (unallocated) strings

Browse Source
This commit is contained in:
peter1138 2007-07-06 08:32:00 +00:00
parent 4854763272
commit 484eb61de1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/saveload.cpp
View File

@ -496,6 +496,7 @@ static void SlSaveLoadConv(void *ptr, VarType conv)
* @return return the net length of the string */
static inline size_t SlCalcNetStringLen(const char *ptr, size_t length)
{
if (ptr == NULL) return 0;
return minu(strlen(ptr), length - 1);
}
@ -573,9 +574,13 @@ static void SlString(void *ptr, size_t length, VarType conv)
case SLE_VAR_STR:
case SLE_VAR_STRQ: // Malloc'd string, free previous incarnation, and allocate
free(*(char**)ptr);
*(char**)ptr = (char*)malloc(len + 1); // terminating '\0'
ptr = *(char**)ptr;
SlCopyBytes(ptr, len);
if (len == 0) {
*(char**)ptr = NULL;
} else {
*(char**)ptr = (char*)malloc(len + 1); // terminating '\0'
ptr = *(char**)ptr;
SlCopyBytes(ptr, len);
}
break;
}