From: Artyom Tarasenko <atar4qemu@googlemail.com>
Date: Fri, 22 Jan 2010 21:31:53 +0000 (+0100)
Subject: sparc32 fix np dereference in do_unassigned_access
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=15e7c45139c74552dccb10a82c7631a68c18170a;p=qemu.git

sparc32 fix np dereference in do_unassigned_access

fix a potential null pointer dereference introduced in
commit	576c2cdc767ab9e2dc038fa4c99f22e53287a3de

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index ce8c6f1aca..eb4f5a4338 100644
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
@@ -3761,13 +3761,14 @@ void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
         else
             raise_exception(TT_DATA_ACCESS);
     }
-    env = saved_env;
 
     /* flush neverland mappings created during no-fault mode,
        so the sequential MMU faults report proper fault types */
     if (env->mmuregs[0] & MMU_NF) {
         tlb_flush(env, 1);
     }
+
+    env = saved_env;
 }
 #else
 void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,