Do not access addresses that belong to the client executable.

It might not be there when we use VEX outside valgrind.

git-svn-id: svn://svn.valgrind.org/vex/trunk@2185

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 13bbd44463f1b4fda6bcf23421875bed30b74537..165a98f0de19a9604b2c0cb89a7607629317cac5 100644 (file)
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -12966,8 +12966,8 @@ s390_decode_and_irgen(UChar *bytes, UInt insn_length, DisResult *dres)
         break;
       }
    }
-   /* next instruction is execute, stop here */
-   if (irsb->next == NULL && (*(char *)(HWord) guest_IA_next_instr == 0x44)) {
+   /* If next instruction is execute, stop here */
+   if (irsb->next == NULL && bytes[insn_length] == 0x44) {
       irsb->next = IRExpr_Const(IRConst_U64(guest_IA_next_instr));
       dis_res->whatNext = Dis_StopHere;
    }