espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 09:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR27294, avr OOM

Browse Source 
PR 27294
	* elf32-avr.c (avr_elf32_load_records_from_section): Use
	bfd_malloc_and_get_section.  Use bfd_byte* vars and remove then
	unnecessary casts.
This commit is contained in:
Alan Modra
2021-02-11 16:56:22 +10:30
parent 1cfcf3004e
commit 31c711a2b3
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2021-02-11 Alan Modra <amodra@gmail.com>
PR 27294
* elf32-avr.c (avr_elf32_load_records_from_section): Use
bfd_malloc_and_get_section. Use bfd_byte* vars and remove then
unnecessary casts.
2021-02-11 Alan Modra <amodra@gmail.com> 2021-02-11 Alan Modra <amodra@gmail.com>
PR 27291 PR 27291

16
bfd/elf32-avr.c
View File

@ -4001,7 +4001,7 @@ avr_find_section_for_address (bfd *abfd ATTRIBUTE_UNUSED,
static struct avr_property_record_list * static struct avr_property_record_list *
avr_elf32_load_records_from_section (bfd *abfd, asection *sec) avr_elf32_load_records_from_section (bfd *abfd, asection *sec)
{ {
char *contents = NULL, *ptr; bfd_byte *contents, *ptr;
bfd_size_type size, mem_size; bfd_size_type size, mem_size;
bfd_byte version, flags; bfd_byte version, flags;
uint16_t record_count, i; uint16_t record_count, i;
@ -4011,9 +4011,8 @@ avr_elf32_load_records_from_section (bfd *abfd, asection *sec)
fs_data.section = NULL; fs_data.section = NULL;
size = bfd_section_size (sec); if (!bfd_malloc_and_get_section (abfd, sec, &contents))
contents = bfd_malloc (size); goto load_failed;
bfd_get_section_contents (abfd, sec, contents, 0, size);
ptr = contents; ptr = contents;
/* Load the relocations for the '.avr.prop' section if there are any, and /* Load the relocations for the '.avr.prop' section if there are any, and
@ -4032,15 +4031,16 @@ avr_elf32_load_records_from_section (bfd *abfd, asection *sec)
*/ */
/* Check we have at least got a headers worth of bytes. */ /* Check we have at least got a headers worth of bytes. */
size = bfd_section_size (sec);
if (size < AVR_PROPERTY_SECTION_HEADER_SIZE) if (size < AVR_PROPERTY_SECTION_HEADER_SIZE)
goto load_failed; goto load_failed;
version = *((bfd_byte *) ptr); version = *ptr;
ptr++; ptr++;
flags = *((bfd_byte *) ptr); flags = *ptr;
ptr++; ptr++;
record_count = bfd_get_16 (abfd, ptr); record_count = bfd_get_16 (abfd, ptr);
ptr+=2; ptr += 2;
BFD_ASSERT (ptr - contents == AVR_PROPERTY_SECTION_HEADER_SIZE); BFD_ASSERT (ptr - contents == AVR_PROPERTY_SECTION_HEADER_SIZE);
/* Now allocate space for the list structure, and all of the list /* Now allocate space for the list structure, and all of the list
@ -4135,7 +4135,7 @@ avr_elf32_load_records_from_section (bfd *abfd, asection *sec)
= address - bfd_section_vma (fs_data.section); = address - bfd_section_vma (fs_data.section);
} }
r_list->records [i].type = *((bfd_byte *) ptr); r_list->records [i].type = *ptr;
ptr += 1; ptr += 1;
size -= 1; size -= 1;