cpp/openttd-patchpack/source Changeset - r13099:96cb24edd6f2

Changeset - r13099:96cb24edd6f2

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

smatz - 15 years ago 2009-09-22 12:42:56
smatz@openttd.org

(svn r17611) -Fix: buffers used for verifying company and president name length were too short, possibly causing false positives

3 files changed with 13 insertions and 6 deletions:

src/company_cmd.cpp

src/strings_type.h

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -260,7 +260,9 @@ static void GenerateCompanyName(Company @@
 	StringID str;
 	Company *cc;
 	uint32 strp;
 	char buffer[100];
 	/* Reserve space for extra unicode character. We need to do this to be able
 	 * to detect too long company name. */
 	char buffer[MAX_LENGTH_COMPANY_NAME_BYTES + MAX_CHAR_LENGTH];
 	if (c->name_1 != STR_SV_UNNAMED) return;
@@ @@ -392,7 +394,9 @@ restart:; @@
 		c->president_name_2 = Random();
 		c->president_name_1 = SPECSTR_PRESIDENT_NAME;
 		char buffer[MAX_LENGTH_PRESIDENT_NAME_BYTES + 1];
 		/* Reserve space for extra unicode character. We need to do this to be able
 		 * to detect too long president name. */
 		char buffer[MAX_LENGTH_PRESIDENT_NAME_BYTES + MAX_CHAR_LENGTH];
 		SetDParam(0, c->index);
 		GetString(buffer, STR_PRESIDENT_NAME, lastof(buffer));
 		if (strlen(buffer) >= MAX_LENGTH_PRESIDENT_NAME_BYTES) continue;
@@ @@ -400,7 +404,8 @@ restart:; @@
 		Company *cc;
 		FOR_ALL_COMPANIES(cc) {
 			if (c != cc) {
 				char buffer2[MAX_LENGTH_PRESIDENT_NAME_BYTES + 2];
 				/* Reserve extra space so even overlength president names can be compared. */
 				char buffer2[MAX_LENGTH_PRESIDENT_NAME_BYTES + MAX_CHAR_LENGTH];
 				SetDParam(0, cc->index);
 				GetString(buffer2, STR_PRESIDENT_NAME, lastof(buffer2));
 				if (strcmp(buffer2, buffer) == 0) goto restart;

src/strings_type.h

➞

Show inline comments

@@ @@ -17,6 +17,7 @@ @@
  */
 typedef uint16 StringID;
 static const StringID INVALID_STRING_ID = 0xFFFF;  ///< Constant representing an invalid string
 static const int MAX_CHAR_LENGTH = 4; ///< Max. length of UTF-8 encoded unicode character
 enum {
 	MAX_LANG = 64, ///< Maximal number of languages supported by the game

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -1419,9 +1419,10 @@ struct TownNameParams { @@
  */
 static bool VerifyTownName(uint32 r, const TownNameParams *par)
+{
 	/* reserve space for extra unicode character and terminating '\0' */
 	char buf1[MAX_LENGTH_TOWN_NAME_BYTES + 4 + 1];
 	char buf2[MAX_LENGTH_TOWN_NAME_BYTES + 4 + 1];
 	/* Reserve space for extra unicode character. We need to do this to be able
 	 * to detect too long town name. */
 	char buf1[MAX_LENGTH_TOWN_NAME_BYTES + MAX_CHAR_LENGTH];
 	char buf2[MAX_LENGTH_TOWN_NAME_BYTES + MAX_CHAR_LENGTH];
 	SetDParam(0, r);
 	if (par->grf && par->grfid != 0) {

0 comments (0 inline, 0 general)