From c21a360787e691bf5837c1bd672b3e0eae031c32 Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Mon, 23 Nov 2015 21:54:28 -0500 Subject: [PATCH] Prevent failures when disassembling --- pwndbg/disasm/x86.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pwndbg/disasm/x86.py b/pwndbg/disasm/x86.py index c563ca5b5..2fcd6d838 100644 --- a/pwndbg/disasm/x86.py +++ b/pwndbg/disasm/x86.py @@ -116,7 +116,8 @@ class DisassemblyAssistant(pwndbg.disasm.arch.DisassemblyAssistant): address = (pwndbg.regs.sp) + (pwndbg.arch.ptrsize * pop) - return int(pwndbg.memory.poi(pwndbg.typeinfo.ppvoid, address)) + if pwndbg.memory.peek(address): + return int(pwndbg.memory.poi(pwndbg.typeinfo.ppvoid, address))