mmo-ref/og-northstar-launcher
1
0
Fork 0
mirror of https://github.com/R2Northstar/NorthstarLauncher synced 2026-08-23 20:26:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crashing when reading audio samples with wide characters (#841)

Browse source
This commit is contained in:
Jack 2025-04-10 22:51:39 +01:00 • committed by GitHub
parent b0fd032edd
commit 457478229f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
primedev/client/audio.cpp
View file

@ -190,13 +190,15 @@ EventOverrideData::EventOverrideData(const std::string& data, const fs::path& pa
{
if (file.is_regular_file() && file.path().extension().string() == ".wav")
{
std::string pathString = file.path().string();
std::wstring pathString = file.path().wstring();
// Retrieve event id from path (standard?)
std::string eventId = file.path().parent_path().filename().string();
const fs::path eventFilename = file.path().parent_path().filename();
std::string eventId = eventFilename.string();
if (std::find(registeredEvents.begin(), registeredEvents.end(), eventId) != registeredEvents.end())
{
spdlog::warn("{} couldn't be loaded because {} event has already been overrided, skipping.", pathString, eventId);
spdlog::warn(
L"{} couldn't be loaded because {} event has already been overrided, skipping.", pathString, eventFilename.wstring());
continue;
}
@ -205,7 +207,7 @@ EventOverrideData::EventOverrideData(const std::string& data, const fs::path& pa
if (wavStream.fail())
{
spdlog::error("Failed reading audio sample {}", file.path().string());
spdlog::error(L"Failed reading audio sample {}", pathString);
continue;
}
@ -231,7 +233,7 @@ EventOverrideData::EventOverrideData(const std::string& data, const fs::path& pa
// would be weird if this got hit, since it would've worked previously
if (wavStream.fail())
{
spdlog::error("Failed async read of audio sample {}", pathString);
spdlog::error(L"Failed async read of audio sample {}", pathString);
return;
}
@ -240,7 +242,7 @@ EventOverrideData::EventOverrideData(const std::string& data, const fs::path& pa
wavStream.read(reinterpret_cast<char*>(data), fileSize);
wavStream.close();
spdlog::info("Finished async read of audio sample {}", pathString);
spdlog::info(L"Finished async read of audio sample {}", pathString);
});
readThread.detach();

2
primedev/thirdparty/spdlog/tweakme.h vendored
View file

@ -77,7 +77,7 @@
///////////////////////////////////////////////////////////////////////////////
// Uncomment to enable wchar_t support (convert to utf8)
//
// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT
#define SPDLOG_WCHAR_TO_UTF8_SUPPORT
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////