mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24981) -Fix: handle corner case where an encoded string contains too many parameters more gracefully

release/1.3
rubidium 2013-02-08 20:32:56 +00:00
parent b9b34bc898
commit bb225ae39e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/strings.cpp
View File

@ -1048,8 +1048,13 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
/* Strings that consume arguments */ /* Strings that consume arguments */
StringID str = args->GetInt32(b); StringID str = args->GetInt32(b);
if (game_script && GB(str, TAB_COUNT_OFFSET, TAB_COUNT_BITS) != GAME_TEXT_TAB) break; if (game_script && GB(str, TAB_COUNT_OFFSET, TAB_COUNT_BITS) != GAME_TEXT_TAB) break;
StringParameters sub_args(*args, b - SCC_STRING1 + 1); uint size = b - SCC_STRING1 + 1;
buff = GetStringWithArgs(buff, str, &sub_args, last, next_substr_case_index, game_script); if (game_script && size > args->num_param - args->offset) {
buff = strecat(buff, "(too many parameters)", last);
} else {
StringParameters sub_args(*args, size);
buff = GetStringWithArgs(buff, str, &sub_args, last, next_substr_case_index, game_script);
}
next_substr_case_index = 0; next_substr_case_index = 0;
break; break;
} }