From bc7306b352fa8c9133be8ec05b080333952fbfe4 Mon Sep 17 00:00:00 2001 From: gibbed Date: Thu, 24 May 2018 03:26:29 -0500 Subject: [PATCH] [Kernel] Fix XamLoaderGetLaunchDataSize to set size to 0 for games that don't check its return value. --- src/xenia/kernel/xam/xam_info.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/xenia/kernel/xam/xam_info.cc b/src/xenia/kernel/xam/xam_info.cc index 604c8027a..2c14e4763 100644 --- a/src/xenia/kernel/xam/xam_info.cc +++ b/src/xenia/kernel/xam/xam_info.cc @@ -104,11 +104,16 @@ dword_result_t XamLoaderGetLaunchDataSize(lpdword_t size_ptr) { auto xam = kernel_state()->GetKernelModule("xam.xex"); auto& loader_data = xam->loader_data(); + if (!size_ptr) { + return X_ERROR_INVALID_PARAMETER; + } + if (loader_data.launch_data_present) { *size_ptr = uint32_t(xam->loader_data().launch_data.size()); return X_ERROR_SUCCESS; } + *size_ptr = 0; return X_ERROR_NOT_FOUND; } DECLARE_XAM_EXPORT(XamLoaderGetLaunchDataSize, ExportTag::kSketchy);