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

(svn r21346) -Fix (r2592): buffer overflow in strgen for strings with very large arguments

Browse Source
This commit is contained in:
yexo 2010-11-28 19:39:04 +00:00
parent 9b54d4266b
commit 35af463046
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/strgen/strgen.cpp
View File

@ -56,6 +56,8 @@ static const char *_output_filename = NULL; ///< The filename of the output, so
static int _cur_line; ///< The current line we're parsing in the input file static int _cur_line; ///< The current line we're parsing in the input file
static int _errors, _warnings, _show_todo; static int _errors, _warnings, _show_todo;
static const size_t MAX_COMMAND_PARAM_SIZE = 100; ///< Maximum size of every command block, not counting the name of the command itself
struct LangString { struct LangString {
char *name; // Name of the string char *name; // Name of the string
char *english; // English text char *english; // English text
@ -489,7 +491,7 @@ static const CmdStruct *ParseCommandString(const char **str, char *param, int *a
strgen_error("Missing } from command '%s'", start); strgen_error("Missing } from command '%s'", start);
return NULL; return NULL;
} }
if (s - start == 250) error("param command too long"); if (s - start == MAX_COMMAND_PARAM_SIZE) error("param command too long");
*param++ = c; *param++ = c;
} }
} }
@ -578,7 +580,7 @@ static void HandlePragma(char *str, bool master)
static void ExtractCommandString(ParsedCommandStruct *p, const char *s, bool warnings) static void ExtractCommandString(ParsedCommandStruct *p, const char *s, bool warnings)
{ {
char param[100]; char param[MAX_COMMAND_PARAM_SIZE];
int argno; int argno;
int argidx = 0; int argidx = 0;
int casei; int casei;
@ -857,7 +859,7 @@ static void MakeHashOfStrings()
if (ls != NULL) { if (ls != NULL) {
const CmdStruct *cs; const CmdStruct *cs;
const char *s; const char *s;
char buf[256]; char buf[MAX_COMMAND_PARAM_SIZE];
int argno; int argno;
int casei; int casei;
@ -1012,7 +1014,7 @@ static void PutCommandString(const char *str)
continue; continue;
} }
char param[256]; char param[MAX_COMMAND_PARAM_SIZE];
int argno; int argno;
int casei; int casei;
const CmdStruct *cs = ParseCommandString(&str, param, &argno, &casei); const CmdStruct *cs = ParseCommandString(&str, param, &argno, &casei);