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

[Base/Kernel] Add and use truncating null-terminating string copying

Browse Source
This commit is contained in:
Triang3l
2020-11-14 23:22:24 +03:00
committed by Rick Gibbed
parent 68cf47e245
commit 91d5ba444a
5 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
*/
#include "xenia/base/logging.h"
#include "xenia/base/math.h"
#include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xam/xam_private.h"
@@ -223,7 +224,8 @@ dword_result_t XamContentCreateDeviceEnumerator(dword_t content_type,
xe::store_and_swap(&dev->device_type, dummy_device_info_.device_type);
xe::store_and_swap(&dev->total_bytes, dummy_device_info_.total_bytes);
xe::store_and_swap(&dev->free_bytes, dummy_device_info_.free_bytes);
xe::copy_and_swap(dev->name, dummy_device_info_.name, 28);
xe::copy_and_swap(dev->name, dummy_device_info_.name,
xe::countof(dev->name));
}
*handle_out = e->handle();