OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix address violation when disassembling a corrupt binary.

Browse Source 
PR binutils/21580
binutils * objdump.c (disassemble_bytes): Check for buffer overrun when
	printing out rae insns.

ld	* testsuite/ld-nds32/diff.d: Adjust expected output.
This commit is contained in:
Nick Clifton 2017-06-14 16:50:03 +01:00
parent 6394c60699
commit ae87f7e73e
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binutils/objdump.c
View File

@ -1918,20 +1918,23 @@ disassemble_bytes (struct disassemble_info * inf,
for (j = addr_offset * opb; j < addr_offset * opb + pb; j += bpc)
{
int k;
/* PR 21580: Check for a buffer ending early. */
if (j + bpc <= stop_offset * opb)
{
int k;
if (bpc > 1 && inf->display_endian == BFD_ENDIAN_LITTLE)
{
for (k = bpc - 1; k >= 0; k--)
printf ("%02x", (unsigned) data[j + k]);
putchar (' ');
}
else
{
for (k = 0; k < bpc; k++)
printf ("%02x", (unsigned) data[j + k]);
putchar (' ');
if (inf->display_endian == BFD_ENDIAN_LITTLE)
{
for (k = bpc - 1; k >= 0; k--)
printf ("%02x", (unsigned) data[j + k]);
}
else
{
for (k = 0; k < bpc; k++)
printf ("%02x", (unsigned) data[j + k]);
}
}
putchar (' ');
}
for (; pb < octets_per_line; pb += bpc)

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2017-06-14 Nick Clifton <nickc@redhat.com>
PR binutils/21580
* testsuite/ld-nds32/diff.d: Adjust expected output.
2017-06-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/20022

6
ld/testsuite/ld-nds32/diff.d
View File

@ -7,9 +7,9 @@
Disassembly of section .data:
00008000 <WORD> (7e 00 00 00|00 00 00 7e).*
00008004 <HALF> (7e 00 7e fe|00 7e 7e fe).*
00008006 <BYTE> 7e fe 00 fe.*
00008007 <ULEB128> fe 00.*
00008004 <HALF> (7e 00|00 7e).*
00008006 <BYTE> 7e.*
00008007 <ULEB128> fe.*
...
00008009 <ULEB128_2> fe 00.*
.*