ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[XAM] XamUserGetName: Fixed issue introduced in previous commit

This commit is contained in:
Gliniak 2025-01-01 18:43:52 +01:00
parent 3f0a7f171f
commit b757601f01
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenia/kernel/xam/xam_user.cc
View File

@ -145,23 +145,25 @@ dword_result_t XamUserGetName_entry(dword_t user_index, dword_t buffer,
return X_ERROR_INVALID_PARAMETER; return X_ERROR_INVALID_PARAMETER;
} }
kernel_memory()->Zero(buffer, buffer_len);
if (!kernel_state()->xam_state()->IsUserSignedIn(user_index)) { if (!kernel_state()->xam_state()->IsUserSignedIn(user_index)) {
// Based on XAM only first byte is cleared in case of lack of user.
kernel_memory()->Zero(buffer, 1);
return X_ERROR_NO_SUCH_USER; return X_ERROR_NO_SUCH_USER;
} }
const auto& user_profile = const auto& user_profile =
kernel_state()->xam_state()->GetUserProfile(user_index); kernel_state()->xam_state()->GetUserProfile(user_index);
// Because name is always limited to 16 characters we can assume length will // Because name is always limited to 15 characters we can assume length will
// never exceed that limit. // never exceed that limit.
const auto& user_name = user_profile->name(); const auto& user_name = user_profile->name();
// buffer_len includes null-terminator. user_name does not.
const uint32_t bytes_to_copy = std::min(
buffer_len.value(), static_cast<uint32_t>(user_name.length()) + 1);
char* str_buffer = kernel_memory()->TranslateVirtual<char*>(buffer); char* str_buffer = kernel_memory()->TranslateVirtual<char*>(buffer);
xe::string_util::copy_truncating( xe::string_util::copy_truncating(str_buffer, user_name, bytes_to_copy);
str_buffer, user_name,
std::min(buffer_len.value(), static_cast<uint32_t>(user_name.length())));
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
DECLARE_XAM_EXPORT1(XamUserGetName, kUserProfiles, kImplemented); DECLARE_XAM_EXPORT1(XamUserGetName, kUserProfiles, kImplemented);