fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[VFS] Fixed crash on filename extraction from path.

Browse Source 
Names are in CP1252 which fails conversion to utf8.
This commit is contained in:
Gliniak
2024-08-31 18:15:13 +02:00
parent 59eed7818f
commit 02f5316562
18 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/vfs/devices/disc_image_entry.cc
View File

@@ -18,8 +18,9 @@ namespace xe {
namespace vfs {
DiscImageEntry::DiscImageEntry(Device* device, Entry* parent,
const std::string_view path, MappedMemory* mmap)
: Entry(device, parent, path),
const std::string_view path,
const std::string_view name, MappedMemory* mmap)
: Entry(device, parent, path, name),
mmap_(mmap),
data_offset_(0),
data_size_(0) {}
@@ -30,7 +31,8 @@ std::unique_ptr<DiscImageEntry> DiscImageEntry::Create(
Device* device, Entry* parent, const std::string_view name,
MappedMemory* mmap) {
auto path = xe::utf8::join_guest_paths(parent->path(), name);
auto entry = std::make_unique<DiscImageEntry>(device, parent, path, mmap);
auto entry =
std::make_unique<DiscImageEntry>(device, parent, path, name, mmap);
return std::move(entry);
}