mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Fix segfault when extracting files from the GOG installer

Browse Source
This commit is contained in:
Michael Steenbeek
2022-05-12 23:38:23 +02:00
committed by GitHub
parent 01a0f0feab
commit 5ccf04b2e5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -17,6 +17,7 @@
- Fix: [#17080] “Remove litter” cheat does not empty litter bins.
- Fix: [#17099] Object selection thumbnail box is one pixel too tall.
- Fix: [#17104] Changing map size does not invalidate park size.
- Fix [#17197]: Segfault when extracting files from the GOG installer.
0.4.0 (2022-04-25)
------------------------------------------------------------------------

5
src/openrct2/config/Config.cpp
View File

@@ -744,7 +744,7 @@ namespace Config
return ContextOpenCommonFileDialog(installerPath, desc, 4096);
}
static bool ExtractGogInstaller(u8string_view installerPath, u8string_view targetPath)
static bool ExtractGogInstaller(const u8string& installerPath, const u8string& targetPath)
{
std::string path;
std::string output;
@@ -755,7 +755,8 @@ namespace Config
return false;
}
int32_t exit_status = Platform::Execute(
String::Format("%s '%s' --exclude-temp --output-dir '%s'", path.c_str(), installerPath, targetPath), &output);
String::Format("%s '%s' --exclude-temp --output-dir '%s'", path.c_str(), installerPath.c_str(), targetPath.c_str()),
&output);
log_info("Exit status %d", exit_status);
return exit_status == 0;
}