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

[Kernel] Null terminate string in XamContentGetDeviceName.

This commit is contained in:
gibbed 2018-12-03 12:00:56 -06:00
parent 947eef4701
commit 9dc46eee85
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,11 +57,13 @@ dword_result_t XamContentGetDeviceName(dword_t device_id,
return X_ERROR_DEVICE_NOT_CONNECTED; return X_ERROR_DEVICE_NOT_CONNECTED;
} }
if (name_capacity < wcslen(dummy_device_info_.name) + 1) { auto name = std::wstring(dummy_device_info_.name);
if (name_capacity < name.size() + 1) {
return X_ERROR_INSUFFICIENT_BUFFER; return X_ERROR_INSUFFICIENT_BUFFER;
} }
xe::store_and_swap<std::wstring>(name_buffer, dummy_device_info_.name); xe::store_and_swap<std::wstring>(name_buffer, name);
((wchar_t*)name_buffer)[name.size()] = 0;
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
DECLARE_XAM_EXPORT1(XamContentGetDeviceName, kContent, kImplemented); DECLARE_XAM_EXPORT1(XamContentGetDeviceName, kContent, kImplemented);