Fix: truncating strings in settings could leave invalid Utf8 characters

3 years ago · 31c87ba908
parent 0e449f20dc
commit 31c87ba908
1 changed files with 6 additions and 1 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@ -506,7 +506,12 @@ static void Write_ValidateString(void *ptr, const SaveLoad *sld, const char *p)
 	switch (GetVarMemType(sld->conv)) {
 		case SLE_VAR_STRB:
 		case SLE_VAR_STRBQ:
-			if (p != nullptr) strecpy((char*)ptr, (const char*)p, (char*)ptr + sld->length - 1);
+			if (p != nullptr) {
+				char *begin = (char*)ptr;
+				char *end = begin + sld->length - 1;
+				strecpy(begin, p, end);
+				str_validate(begin, end, SVS_NONE);
+			}
 			break;

 		case SLE_VAR_STR: