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

Handle a NULL playlist name pointer when creating title playlist.

This commit is contained in:
gibbed 2015-06-06 19:32:47 -05:00
parent f0492dfbb0
commit cbd1210337
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/kernel/apps/xmp_app.cc
View File

@ -297,8 +297,13 @@ X_RESULT XXMPApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
xe::store_and_swap<uint32_t>( xe::store_and_swap<uint32_t>(
memory_->TranslateVirtual(playlist_handle_ptr), storage_ptr); memory_->TranslateVirtual(playlist_handle_ptr), storage_ptr);
assert_true(xmp_client == 0x00000002); assert_true(xmp_client == 0x00000002);
auto playlist_name = xe::load_and_swap<std::wstring>( std::wstring playlist_name;
if (!playlist_name_ptr) {
playlist_name = L"";
} else {
playlist_name = xe::load_and_swap<std::wstring>(
memory_->TranslateVirtual(playlist_name_ptr)); memory_->TranslateVirtual(playlist_name_ptr));
}
// dummy_alloc_ptr is the result of a XamAlloc of storage_size. // dummy_alloc_ptr is the result of a XamAlloc of storage_size.
assert_true(storage_size == 4 + song_count * 128); assert_true(storage_size == 4 + song_count * 128);
return XMPCreateTitlePlaylist(songs_ptr, song_count, playlist_name_ptr, return XMPCreateTitlePlaylist(songs_ptr, song_count, playlist_name_ptr,