From 484eb61de186f5d4236d52ad29bc49d7a46a3bed Mon Sep 17 00:00:00 2001 From: peter1138 Date: Fri, 6 Jul 2007 08:32:00 +0000 Subject: [PATCH] (svn r10453) -Codechange: Allow save/load of empty (unallocated) strings --- src/saveload.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/saveload.cpp b/src/saveload.cpp index dd70f7a4a6..86e5152005 100644 --- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -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; }