cpp/openttd-patchpack/source Changeset - r26505:866069a314f7

Changeset - r26505:866069a314f7

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Jonathan G Rennison - 19 months ago 2022-11-05 14:17:18
j.g.rennison@gmail.com

Fix #10129: Use after free in GRFLoadConfig invalid GRF error path (#10130)

1 file changed with 1 insertions and 1 deletions:

src/settings.cpp

0 comments (0 inline, 0 general)

src/settings.cpp

➞

Show inline comments

@@ @@ -1016,7 +1016,7 @@ static GRFConfig *GRFLoadConfig(IniFile @@
 				SetDParam(1, STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN);
+			}
 			SetDParamStr(0, StrEmpty(filename) ? item->name : filename);
+			SetDParamStr(0, StrEmpty(filename) ? item->name.c_str() : filename);
 			ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_GRF, WL_CRITICAL);
 			delete c;
 			continue;

0 comments (0 inline, 0 general)