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

[Base] Fixed issue with unnecessary null terminator after reading u16string

Browse Source
This commit is contained in:
Gliniak
2025-10-30 21:54:58 +01:00
parent edd48cd83d
commit e6828af5e7
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/base/string_util.h
View File

@@ -435,6 +435,7 @@ inline std::u16string read_u16string_and_swap(const char16_t* string_ptr) {
std::u16string output_str = {}; std::u16string output_str = {};
output_str.resize(input_str.size() + 1); output_str.resize(input_str.size() + 1);
copy_and_swap_truncating(output_str.data(), input_str, input_str.size() + 1); copy_and_swap_truncating(output_str.data(), input_str, input_str.size() + 1);
output_str.pop_back(); // Remove nullptr added by copy_and_swap.
return output_str; return output_str;
} }

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

@@ -754,17 +754,17 @@ dword_result_t XamParseGamerTileKey_entry(pointer_t<X_USER_DATA> key_ptr,
return X_ERROR_INVALID_PARAMETER; return X_ERROR_INVALID_PARAMETER;
} }
std::string tile_key = xe::to_utf8(string_util::read_u16string_and_swap( const std::string tile_key = xe::to_utf8(string_util::read_u16string_and_swap(
kernel_memory()->TranslateVirtual<const char16_t*>( kernel_memory()->TranslateVirtual<const char16_t*>(
key_ptr->data.unicode.ptr))); key_ptr->data.unicode.ptr)));
// Default key size is 24 bytes, but we need to include null terminator // Default key size is 24 bytes, but we need to include null terminator
if (tile_key.empty() || tile_key.size() != 25) { if (tile_key.empty() || tile_key.size() != 24) {
return X_ERROR_INVALID_PARAMETER; return X_ERROR_INVALID_PARAMETER;
} }
const bool is_valid_hex_string = const bool is_valid_hex_string =
std::all_of(tile_key.begin(), --tile_key.end(), std::all_of(tile_key.cbegin(), tile_key.cend(),
[](unsigned char c) { return std::isxdigit(c); }); [](unsigned char c) { return std::isxdigit(c); });
if (!is_valid_hex_string) { if (!is_valid_hex_string) {

6
src/xenia/kernel/xam/xdbf/gpd_info_title.cc
View File

@@ -40,8 +40,8 @@ const char16_t* GpdInfoTitle::GetAchievementDescriptionPtr(const uint32_t id) {
return nullptr; return nullptr;
} }
return reinterpret_cast<const char16_t*>(title_ptr + return reinterpret_cast<const char16_t*>(
GetAchievementTitle(id).length()); title_ptr + GetAchievementTitle(id).length() + 1);
} }
const char16_t* GpdInfoTitle::GetAchievementUnachievedDescriptionPtr( const char16_t* GpdInfoTitle::GetAchievementUnachievedDescriptionPtr(
@@ -52,7 +52,7 @@ const char16_t* GpdInfoTitle::GetAchievementUnachievedDescriptionPtr(
} }
return reinterpret_cast<const char16_t*>( return reinterpret_cast<const char16_t*>(
title_ptr + GetAchievementDescription(id).length()); title_ptr + GetAchievementDescription(id).length() + 1);
} }
std::u16string GpdInfoTitle::GetAchievementTitle(const uint32_t id) { std::u16string GpdInfoTitle::GetAchievementTitle(const uint32_t id) {