From 4a59750b305d5df092068ca3df0b6d32c1f4aa1d Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 28 Oct 2014 03:45:01 -0700
Subject: [PATCH] MemArena: Bail on Arch64 if the out_ptr allocation fails

---
 Source/Core/Common/MemArena.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp
index 88cf92a70c..5c3972d44a 100644
--- a/Source/Core/Common/MemArena.cpp
+++ b/Source/Core/Common/MemArena.cpp
@@ -214,10 +214,11 @@ static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32
 		{
 			*views[i].out_ptr = (u8*)arena->CreateView(
 				position, views[i].size, base + (views[i].virtual_address & 0x3FFFFFFF));
-			if (!*views[i].out_ptr)
-				goto bail;
 		}
 #endif
+		if (!*views[i].out_ptr)
+			goto bail;
+
 		last_position = position;
 		position += views[i].size;
 	}