espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-24 12:23:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

asan: assert (addr_ranges) <= (start)

Browse Source 
That assert would be more obvious if it were reported as
"addr_ranges <= end_ranges".  Fix that by using the obvious variable
in the final loop.  Stop the assertion by using a signed comparison:
It's possible for the rounding up of the arange pointer to exceed the
end of the block when the block size is fuzzed.

	* dwarf.c (display_debug_aranges): Use "end_ranges" in loop
	displaying ranges rather that "start".  Simplify rounding up
	to 2*address_size boundary.  Use signed comparison in loop.
This commit is contained in:
Alan Modra
2021-11-03 14:50:18 +10:30
parent 0a129eb19a
commit 359c74415c
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
binutils/dwarf.c
View File

@ -7192,7 +7192,6 @@ display_debug_aranges (struct dwarf_section *section,
dwarf_vma address; dwarf_vma address;
unsigned long sec_off; unsigned long sec_off;
unsigned char address_size; unsigned char address_size;
int excess;
unsigned int offset_size; unsigned int offset_size;
unsigned char *end_ranges; unsigned char *end_ranges;
@ -7277,22 +7276,22 @@ display_debug_aranges (struct dwarf_section *section,
addr_ranges = hdrptr; addr_ranges = hdrptr;
/* Must pad to an alignment boundary that is twice the address size. */ /* Must pad to an alignment boundary that is twice the address size. */
excess = (hdrptr - start) % (2 * address_size); addr_ranges += (2 * address_size - 1
if (excess) - (hdrptr - start - 1) % (2 * address_size));
addr_ranges += (2 * address_size) - excess;
start = end_ranges; while (2 * address_size <= end_ranges - addr_ranges)
while (2u * address_size <= (size_t) (start - addr_ranges))
{ {
SAFE_BYTE_GET_AND_INC (address, addr_ranges, address_size, start); SAFE_BYTE_GET_AND_INC (address, addr_ranges, address_size,
SAFE_BYTE_GET_AND_INC (length, addr_ranges, address_size, start); end_ranges);
SAFE_BYTE_GET_AND_INC (length, addr_ranges, address_size,
end_ranges);
printf (" "); printf (" ");
print_dwarf_vma (address, address_size); print_dwarf_vma (address, address_size);
print_dwarf_vma (length, address_size); print_dwarf_vma (length, address_size);
putchar ('\n'); putchar ('\n');
} }
start = end_ranges;
} }
printf ("\n"); printf ("\n");