From 4e6d29351e3232cfb749e3ac0c7116aca18d44f1 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 25 Nov 2010 23:10:35 +0000 Subject: (svn r21326) -Fix: off-by-one in case choice list construction causing case lists to fail completely --- src/newgrf_text.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index fcaa0e746..2a4f7f63f 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -327,21 +327,19 @@ struct UnmappedChoiceList : ZeroedMemoryAllocator { *d++ = i; /* "" */ - size_t len = strlen(str); + size_t len = strlen(str) + 1; *d++ = GB(len, 8, 8); *d++ = GB(len, 0, 8); /* "" */ memcpy(d, str, len); d += len; - *d++ = '\0'; } /* "" */ - size_t len = strlen(this->strings[0]); + size_t len = strlen(this->strings[0]) + 1; memcpy(d, this->strings[0], len); d += len; - *d++ = '\0'; } else { if (this->type == SCC_PLURAL_LIST) { *d++ = lm->plural_form; -- cgit v1.2.3-54-g00ecf