From 194c13f9778e5ec47baf50304fa7057952d2aa89 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Tue, 29 Dec 2015 13:00:51 -0800
Subject: [PATCH] REBASE: Fix vector out of range access.

---
 src/xenia/kernel/xobject.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xenia/kernel/xobject.cc b/src/xenia/kernel/xobject.cc
index 2bff5647b..2df381000 100644
--- a/src/xenia/kernel/xobject.cc
+++ b/src/xenia/kernel/xobject.cc
@@ -34,7 +34,9 @@ XObject::XObject(KernelState* kernel_state, Type type)
       allocated_guest_object_(false) {
   handles_.reserve(10);
   if (kernel_state) {
-    kernel_state->object_table()->AddHandle(this, &handles_[0]);
+    X_HANDLE handle;
+    kernel_state->object_table()->AddHandle(this, &handle);
+    handles_[0] = handle;
   }
 }