From 4dc0573c2293ba58a1ac6b5cf53a1f335a677d0a Mon Sep 17 00:00:00 2001
From: Zach Riggle <riggle@google.com>
Date: Wed, 20 Apr 2016 13:41:45 -0700
Subject: [PATCH] Fixes for QEMU usermode and ARM

---
 pwndbg/disasm/arch.py | 2 ++
 pwndbg/vmmap.py       | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/pwndbg/disasm/arch.py b/pwndbg/disasm/arch.py
index b07fa22df..52d3819df 100644
--- a/pwndbg/disasm/arch.py
+++ b/pwndbg/disasm/arch.py
@@ -94,6 +94,8 @@ class DisassemblyAssistant(object):
             next_addr = self.next(instruction)
 
         instruction.target = None
+        instruction.target_constant = None
+        instruction.next = None
 
         if next_addr is None:
             next_addr = instruction.address + instruction.size
diff --git a/pwndbg/vmmap.py b/pwndbg/vmmap.py
index 19d85461f..83eca5d39 100644
--- a/pwndbg/vmmap.py
+++ b/pwndbg/vmmap.py
@@ -113,6 +113,9 @@ def proc_pid_maps():
         A list of pwndbg.memory.Page objects.
     """
 
+    if pwndbg.qemu.is_qemu_usermode():
+        return tuple()
+
     example_proc_pid_maps = """
     7f95266fa000-7f95268b5000 r-xp 00000000 08:01 418404                     /lib/x86_64-linux-gnu/libc-2.19.so
     7f95268b5000-7f9526ab5000 ---p 001bb000 08:01 418404                     /lib/x86_64-linux-gnu/libc-2.19.so