yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #12320 from liamwhite/debug-fix 

debug: fix reading of module names
This commit is contained in:
liamwhite 2023-12-09 13:38:39 -05:00 committed by GitHub
parent f447996080 fe5e4bd846
commit 5646e313a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/arm/debug.cpp
View File

@ -282,6 +282,8 @@ Loader::AppLoader::Modules FindModules(const Kernel::KProcess* process) {
// Ignore leading directories. // Ignore leading directories.
char* path_pointer = module_path.path.data(); char* path_pointer = module_path.path.data();
char* path_end =
path_pointer + std::min(PathLengthMax, module_path.path_length);
for (s32 i = 0; i < std::min(PathLengthMax, module_path.path_length) && for (s32 i = 0; i < std::min(PathLengthMax, module_path.path_length) &&
module_path.path[i] != '\0'; module_path.path[i] != '\0';
@ -292,7 +294,8 @@ Loader::AppLoader::Modules FindModules(const Kernel::KProcess* process) {
} }
// Insert output. // Insert output.
modules.emplace(svc_mem_info.base_address, path_pointer); modules.emplace(svc_mem_info.base_address,
std::string_view(path_pointer, path_end));
} }
} }
} }