From 43d7fc5158efb6dedd95e0751e2a1b9bcfedc527 Mon Sep 17 00:00:00 2001
From: Gliniak <Gliniak93@gmail.com>
Date: Sun, 11 Dec 2022 21:06:47 +0100
Subject: [PATCH] [APU] Shuffle checks to hopefully prevent crashing from
 logger

---
 src/xenia/apu/xma_context.cc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/xenia/apu/xma_context.cc b/src/xenia/apu/xma_context.cc
index df9d759d9..2d11e7c3b 100644
--- a/src/xenia/apu/xma_context.cc
+++ b/src/xenia/apu/xma_context.cc
@@ -355,6 +355,17 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
                      : nullptr;
   uint8_t* current_input_buffer = data->current_buffer ? in1 : in0;
 
+  if (!current_input_buffer) {
+    XELOGE("XmaContext {}: Error - input buffer pointer is invalid!", id());
+    return;
+  }
+
+  if (!data->output_buffer_block_count) {
+    XELOGE("XmaContext {}: Error - Received 0 for output_buffer_block_count!",
+           id());
+    return;
+  }
+
   XELOGAPU(
       "Processing context {} (offset {}, buffer {}, ptr {:p}, output buffer "
       "{:08X}, output buffer count {})",
@@ -362,14 +373,6 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
       current_input_buffer, data->output_buffer_ptr,
       data->output_buffer_block_count);
 
-  if (!current_input_buffer) {
-    return;
-  }
-  if (!data->output_buffer_block_count) {
-    XELOGE("XmaContext {}: Error - Received 0 for output_buffer_block_count!",
-           id());
-    return;
-  }
   size_t input_buffer_0_size =
       data->input_buffer_0_packet_count * kBytesPerPacket;
   size_t input_buffer_1_size =