From 3b3c9c1c3a5ca30f42146c6feb1c9f2a4552ec65 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 5 Nov 2022 14:17:18 +0000 Subject: [PATCH] Fix #10129: Use after free in GRFLoadConfig invalid GRF error path (#10130) --- src/settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.cpp b/src/settings.cpp index 4decfecf34..975c82f850 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1016,7 +1016,7 @@ static GRFConfig *GRFLoadConfig(IniFile &ini, const char *grpname, bool is_stati 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;