From 5884c94deddb665049d54736ae0b966ccae1d45a Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Mon, 23 Nov 2015 21:55:38 -0500 Subject: [PATCH] Remove print which breaks Python3 and provide a sane default for u() --- pwndbg/memory.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pwndbg/memory.py b/pwndbg/memory.py index 8eb1146d8..a399e2d75 100644 --- a/pwndbg/memory.py +++ b/pwndbg/memory.py @@ -4,6 +4,7 @@ Reading, writing, and describing memory. """ import gdb +import pwndbg.arch import pwndbg.compat import pwndbg.typeinfo @@ -73,7 +74,9 @@ def u16(addr): return readtype(pwndbg.typeinfo.uint16, addr) def u32(addr): return readtype(pwndbg.typeinfo.uint32, addr) def u64(addr): return readtype(pwndbg.typeinfo.uint64, addr) -def u(addr, size): +def u(addr, size=None): + if size is None: + size = pwndbg.arch.ptrsize * 8 return { 8: u8, 16: u16, @@ -92,7 +95,6 @@ def write(addr, data): def poi(type, addr): return gdb.Value(addr).cast(type.pointer()).dereference() def round_down(address, align): - print repr(address), repr(align) return address & ~(align-1) def round_up(address, align): return (address+(align-1))&(~(align-1))