dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: memory leak due to assigning result of strdup to a std::string

Browse Source 
(cherry picked from commit 296194ad36)
This commit is contained in:
Rubidium
2021-05-09 22:51:26 +02:00
committed by Jonathan G Rennison
parent bf87578173
commit 7c4d803265
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf.cpp
View File

@@ -7563,7 +7563,7 @@ static void GRFInhibit(ByteReader *buf)
if (file != nullptr && file != _cur.grfconfig) { if (file != nullptr && file != _cur.grfconfig) {
grfmsg(2, "GRFInhibit: Deactivating file '%s'", file->GetDisplayPath()); grfmsg(2, "GRFInhibit: Deactivating file '%s'", file->GetDisplayPath());
GRFError *error = DisableGrf(STR_NEWGRF_ERROR_FORCEFULLY_DISABLED, file); GRFError *error = DisableGrf(STR_NEWGRF_ERROR_FORCEFULLY_DISABLED, file);
error->data = stredup(_cur.grfconfig->GetName()); error->data = _cur.grfconfig->GetName();
} }
} }
} }

2
src/signs_cmd.cpp
View File

@@ -54,7 +54,7 @@ CommandCost CmdPlaceSign(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
si->y = y; si->y = y;
si->z = GetSlopePixelZ(x, y); si->z = GetSlopePixelZ(x, y);
if (!StrEmpty(text)) { if (!StrEmpty(text)) {
si->name = stredup(text); si->name = text;
} }
si->UpdateVirtCoord(); si->UpdateVirtCoord();
InvalidateWindowData(WC_SIGN_LIST, 0, 0); InvalidateWindowData(WC_SIGN_LIST, 0, 0);

2
src/town_cmd.cpp
View File

@@ -2228,7 +2228,7 @@ CommandCost CmdFoundTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
old_generating_world.Restore(); old_generating_world.Restore();
if (t != nullptr && !StrEmpty(text)) { if (t != nullptr && !StrEmpty(text)) {
t->name = stredup(text); t->name = text;
t->UpdateVirtCoord(); t->UpdateVirtCoord();
} }