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

[XAM] Fixed size used in read_u16string_and_swap

Browse Source
This commit is contained in:
Adrian
2025-12-17 19:52:49 +00:00
committed by Radosław Gliński
parent e786d5c8c3
commit ac66db337b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,16 +429,6 @@ inline vec128_t from_string<vec128_t>(const std::string_view value,
return v; return v;
} }
inline std::u16string read_u16string_and_swap(const char16_t* string_ptr) {
std::u16string input_str = std::u16string(string_ptr);
std::u16string output_str = {};
output_str.resize(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;
}
inline size_t size_in_bytes(std::variant<std::string, std::u16string> string, inline size_t size_in_bytes(std::variant<std::string, std::u16string> string,
bool include_terminator = true) { bool include_terminator = true) {
if (std::holds_alternative<std::string>(string)) { if (std::holds_alternative<std::string>(string)) {
@@ -452,6 +442,17 @@ inline size_t size_in_bytes(std::variant<std::string, std::u16string> string,
return 0; return 0;
} }
inline std::u16string read_u16string_and_swap(const char16_t* string_ptr) {
std::u16string input_str = std::u16string(string_ptr);
std::u16string output_str = {};
output_str.resize(input_str.size() + 1);
copy_and_swap_truncating(output_str.data(), input_str,
size_in_bytes(input_str, false));
output_str.pop_back(); // Remove nullptr added by copy_and_swap.
return output_str;
}
} // namespace string_util } // namespace string_util
} // namespace xe } // namespace xe