CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4489 from lioncash/typesafe 

ipc_helpers: Only allow trivially copyable objects with PushRaw() and PopRaw()
This commit is contained in:
bunnei 2020-08-05 23:20:23 -04:00 committed by GitHub
parent 35c1607f23 a77ee63f65
commit 1cc0e4b4d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/ipc_helpers.h
View File

@ -229,6 +229,8 @@ inline void ResponseBuilder::Push(u32 value) {
template <typename T> template <typename T>
void ResponseBuilder::PushRaw(const T& value) { void ResponseBuilder::PushRaw(const T& value) {
static_assert(std::is_trivially_copyable_v<T>,
"It's undefined behavior to use memcpy with non-trivially copyable objects");
std::memcpy(cmdbuf + index, &value, sizeof(T)); std::memcpy(cmdbuf + index, &value, sizeof(T));
index += (sizeof(T) + 3) / 4; // round up to word length index += (sizeof(T) + 3) / 4; // round up to word length
} }
@ -384,6 +386,8 @@ inline s32 RequestParser::Pop() {
template <typename T> template <typename T>
void RequestParser::PopRaw(T& value) { void RequestParser::PopRaw(T& value) {
static_assert(std::is_trivially_copyable_v<T>,
"It's undefined behavior to use memcpy with non-trivially copyable objects");
std::memcpy(&value, cmdbuf + index, sizeof(T)); std::memcpy(&value, cmdbuf + index, sizeof(T));
index += (sizeof(T) + 3) / 4; // round up to word length index += (sizeof(T) + 3) / 4; // round up to word length
} }