From 8a7a9dc9d9f5b26dc5f5b9e0adf6b326c7c373e6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 10 Aug 1999 15:02:41 +0000 Subject: From Wally Iimura : * dis-buf.c (buffer_read_memory): Rewrite expression to avoid overflow at end of address space. (generic_print_address): Use sprintf_vma. --- opcodes/ChangeLog | 7 +++++++ opcodes/dis-buf.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9f3cbe6a3d4..19349c6feb4 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +1999-08-10 Ian Lance Taylor + + From Wally Iimura : + * dis-buf.c (buffer_read_memory): Rewrite expression to avoid + overflow at end of address space. + (generic_print_address): Use sprintf_vma. + 1999-08-08 Ian Lance Taylor * Makefile.am: Rename .dep* files to DEP*. Change DEP variable to diff --git a/opcodes/dis-buf.c b/opcodes/dis-buf.c index c6e512122eb..523fe72789d 100644 --- a/opcodes/dis-buf.c +++ b/opcodes/dis-buf.c @@ -30,7 +30,7 @@ buffer_read_memory (memaddr, myaddr, length, info) struct disassemble_info *info; { if (memaddr < info->buffer_vma - || memaddr + length > info->buffer_vma + info->buffer_length) + || memaddr - info->buffer_vma + length > info->buffer_length) /* Out of bounds. Use EIO because GDB uses it. */ return EIO; memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length); @@ -67,7 +67,10 @@ generic_print_address (addr, info) bfd_vma addr; struct disassemble_info *info; { - (*info->fprintf_func) (info->stream, "0x%x", addr); + char buf[30]; + + sprintf_vma (buf, addr); + (*info->fprintf_func) (info->stream, "0x%s", buf); } /* Just concatenate the address as hex. This is included for -- cgit v1.2.1