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

[XMP] Add extra checks from XAM to help prevent dash host crash

This commit is contained in:
emoose 2020-01-04 20:14:16 +00:00
parent e11abb8efa
commit f245dd9cc0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/kernel/xam/apps/xmp_app.cc
View File

@ -351,8 +351,16 @@ X_RESULT XmpApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
}
case 0x00070013: {
assert_true(!buffer_length || buffer_length == 8);
if (!buffer) {
return X_E_INVALIDARG;
}
uint32_t xmp_client = xe::load_and_swap<uint32_t>(buffer + 0);
uint32_t storage_ptr = xe::load_and_swap<uint32_t>(buffer + 4);
if (!storage_ptr) {
// dash seems to call this with empty storage_ptr, XAM returns this
// error:
return X_E_INVALIDARG;
}
uint32_t playlist_handle =
xe::load_and_swap<uint32_t>(memory_->TranslateVirtual(storage_ptr));
assert_true(xmp_client == 0x00000002);