[binutils-gdb] PR27294, avr OOM

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=31c711a2b302cf27f2cb4d5dd2c495407b384b94

commit 31c711a2b302cf27f2cb4d5dd2c495407b384b94
Author: Alan Modra <amodra@gmail.com>
Date:   Thu Feb 11 16:56:22 2021 +1030

    PR27294, avr OOM
    
            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.

Diff:
---
 bfd/ChangeLog   |  7 +++++++
 bfd/elf32-avr.c | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 41da87b814f..8fb42f9fd14 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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>
 
 	PR 27291
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index 3859796ccc1..ed38ff8bb02 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -4001,7 +4001,7 @@ avr_find_section_for_address (bfd *abfd ATTRIBUTE_UNUSED,
 static struct avr_property_record_list *
 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_byte version, flags;
   uint16_t record_count, i;
@@ -4011,9 +4011,8 @@ avr_elf32_load_records_from_section (bfd *abfd, asection *sec)
 
   fs_data.section = NULL;
 
-  size = bfd_section_size (sec);
-  contents = bfd_malloc (size);
-  bfd_get_section_contents (abfd, sec, contents, 0, size);
+  if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+    goto load_failed;
   ptr = contents;
 
   /* 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.  */
+  size = bfd_section_size (sec);
   if (size < AVR_PROPERTY_SECTION_HEADER_SIZE)
     goto load_failed;
 
-  version = *((bfd_byte *) ptr);
+  version = *ptr;
   ptr++;
-  flags = *((bfd_byte *) ptr);
+  flags = *ptr;
   ptr++;
   record_count = bfd_get_16 (abfd, ptr);
-  ptr+=2;
+  ptr += 2;
   BFD_ASSERT (ptr - contents == AVR_PROPERTY_SECTION_HEADER_SIZE);
 
   /* 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);
 	}
 
-      r_list->records [i].type = *((bfd_byte *) ptr);
+      r_list->records [i].type = *ptr;
       ptr += 1;
       size -= 1;