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] XamContentGetDeviceName param change 

XamContentGetDeviceName was using lpu16string_t for output parameter
This could cause string parse error (conversion to utf16/utf8)
This commit is contained in:
Gliniak 2024-08-25 20:21:05 +02:00
parent 7d385c3844
commit 3a42d9e787
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ std::vector<const DummyDeviceInfo*> ListStorageDevices(bool include_readonly) {
} }
dword_result_t XamContentGetDeviceName_entry(dword_t device_id, dword_result_t XamContentGetDeviceName_entry(dword_t device_id,
lpu16string_t name_buffer, dword_t name_buffer_ptr,
dword_t name_capacity) { dword_t name_capacity) {
auto device_info = GetDummyDeviceInfo(device_id); auto device_info = GetDummyDeviceInfo(device_id);
if (device_info == nullptr) { if (device_info == nullptr) {
@ -84,6 +84,10 @@ dword_result_t XamContentGetDeviceName_entry(dword_t device_id,
if (name_capacity < name.size() + 1) { if (name_capacity < name.size() + 1) {
return X_ERROR_INSUFFICIENT_BUFFER; return X_ERROR_INSUFFICIENT_BUFFER;
} }
char16_t* name_buffer =
kernel_memory()->TranslateVirtual<char16_t*>(name_buffer_ptr);
xe::string_util::copy_and_swap_truncating(name_buffer, name, name_capacity); xe::string_util::copy_and_swap_truncating(name_buffer, name, name_capacity);
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }