bfd_cleanup for object_p

[deliverable/binutils-gdb.git] / bfd / coffgen.c

diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 57a18b02dc1dd10910a6a36db1d4a8ee63af0f8a..6d84d512844411ac1ee7d46e00885aa92ee2bd9b 100644 (file)
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -1,5 +1,5 @@
 /* Support for the generic parts of COFF, for BFD.
 /* Support for the generic parts of COFF, for BFD.

-   Copyright (C) 1990-2019 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -225,12 +225,12 @@ make_a_section_from_file (bfd *abfd,
 
 /* Read in a COFF object and make it into a BFD.  This is used by
    ECOFF as well.  */
 
 /* Read in a COFF object and make it into a BFD.  This is used by
    ECOFF as well.  */

-const bfd_target *
+bfd_cleanup

 coff_real_object_p (bfd *,
                    unsigned,
                    struct internal_filehdr *,
                    struct internal_aouthdr *);
 coff_real_object_p (bfd *,
                    unsigned,
                    struct internal_filehdr *,
                    struct internal_aouthdr *);

-const bfd_target *
+bfd_cleanup

 coff_real_object_p (bfd *abfd,
                    unsigned nscns,
                    struct internal_filehdr *internal_f,
 coff_real_object_p (bfd *abfd,
                    unsigned nscns,
                    struct internal_filehdr *internal_f,


@@ -275,13 +275,10 @@ coff_real_object_p (bfd *abfd,
 
   scnhsz = bfd_coff_scnhsz (abfd);
   readsize = (bfd_size_type) nscns * scnhsz;
 
   scnhsz = bfd_coff_scnhsz (abfd);
   readsize = (bfd_size_type) nscns * scnhsz;

-  external_sections = (char *) bfd_alloc (abfd, readsize);
+  external_sections = (char *) _bfd_alloc_and_read (abfd, readsize, readsize);

   if (!external_sections)
     goto fail;
 
   if (!external_sections)
     goto fail;
 

-  if (bfd_bread ((void *) external_sections, readsize, abfd) != readsize)
-    goto fail;
-

   /* Set the arch/mach *before* swapping in sections; section header swapping
      may depend on arch/mach info.  */
   if (! bfd_coff_set_arch_mach_hook (abfd, (void *) internal_f))
   /* Set the arch/mach *before* swapping in sections; section header swapping
      may depend on arch/mach info.  */
   if (! bfd_coff_set_arch_mach_hook (abfd, (void *) internal_f))


@@ -302,21 +299,23 @@ coff_real_object_p (bfd *abfd,
        }
     }
 
        }
     }
 

-  return abfd->xvec;
+  _bfd_coff_free_symbols (abfd);
+  return _bfd_no_cleanup;

 
  fail:
 
  fail:

+  _bfd_coff_free_symbols (abfd);

   bfd_release (abfd, tdata);
  fail2:
   abfd->tdata.any = tdata_save;
   abfd->flags = oflags;
   abfd->start_address = ostart;
   bfd_release (abfd, tdata);
  fail2:
   abfd->tdata.any = tdata_save;
   abfd->flags = oflags;
   abfd->start_address = ostart;

-  return (const bfd_target *) NULL;
+  return NULL;

 }
 
 /* Turn a COFF file into a BFD, but fail with bfd_error_wrong_format if it is
    not a COFF file.  This is also used by ECOFF.  */
 
 }
 
 /* Turn a COFF file into a BFD, but fail with bfd_error_wrong_format if it is
    not a COFF file.  This is also used by ECOFF.  */
 

-const bfd_target *
+bfd_cleanup

 coff_object_p (bfd *abfd)
 {
   bfd_size_type filhsz;
 coff_object_p (bfd *abfd)
 {
   bfd_size_type filhsz;


@@ -330,14 +329,11 @@ coff_object_p (bfd *abfd)
   filhsz = bfd_coff_filhsz (abfd);
   aoutsz = bfd_coff_aoutsz (abfd);
 
   filhsz = bfd_coff_filhsz (abfd);
   aoutsz = bfd_coff_aoutsz (abfd);
 

-  filehdr = bfd_alloc (abfd, filhsz);
+  filehdr = _bfd_alloc_and_read (abfd, filhsz, filhsz);

   if (filehdr == NULL)
   if (filehdr == NULL)

-    return NULL;
-  if (bfd_bread (filehdr, filhsz, abfd) != filhsz)

     {
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_wrong_format);
     {
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_wrong_format);

-      bfd_release (abfd, filehdr);

       return NULL;
     }
   bfd_coff_swap_filehdr_in (abfd, filehdr, &internal_f);
       return NULL;
     }
   bfd_coff_swap_filehdr_in (abfd, filehdr, &internal_f);


@@ -363,18 +359,13 @@ coff_object_p (bfd *abfd)
     {
       void * opthdr;
 
     {
       void * opthdr;
 

-      opthdr = bfd_alloc (abfd, aoutsz);
+      opthdr = _bfd_alloc_and_read (abfd, aoutsz, internal_f.f_opthdr);

       if (opthdr == NULL)
        return NULL;
       if (opthdr == NULL)
        return NULL;

-      if (bfd_bread (opthdr, (bfd_size_type) internal_f.f_opthdr, abfd)
-         != internal_f.f_opthdr)
-       {
-         bfd_release (abfd, opthdr);
-         return NULL;
-       }

       /* PR 17512: file: 11056-1136-0.004.  */
       if (internal_f.f_opthdr < aoutsz)
       /* PR 17512: file: 11056-1136-0.004.  */
       if (internal_f.f_opthdr < aoutsz)

-       memset (((char *) opthdr) + internal_f.f_opthdr, 0, aoutsz - internal_f.f_opthdr);
+       memset (((char *) opthdr) + internal_f.f_opthdr, 0,
+               aoutsz - internal_f.f_opthdr);

 
       bfd_coff_swap_aouthdr_in (abfd, opthdr, (void *) &internal_a);
       bfd_release (abfd, opthdr);
 
       bfd_coff_swap_aouthdr_in (abfd, opthdr, (void *) &internal_a);
       bfd_release (abfd, opthdr);


@@ -1591,19 +1582,20 @@ build_debug_section (bfd *abfd, asection ** sect_return)
       return NULL;
     }
 
       return NULL;
     }
 

-  sec_size = sect->size;
-  debug_section = (char *) bfd_alloc (abfd, sec_size);
-  if (debug_section == NULL)
-    return NULL;
-

   /* Seek to the beginning of the `.debug' section and read it.
      Save the current position first; it is needed by our caller.
      Then read debug section and reset the file pointer.  */
 
   position = bfd_tell (abfd);
   /* Seek to the beginning of the `.debug' section and read it.
      Save the current position first; it is needed by our caller.
      Then read debug section and reset the file pointer.  */
 
   position = bfd_tell (abfd);

-  if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0
-      || bfd_bread (debug_section, sec_size, abfd) != sec_size
-      || bfd_seek (abfd, position, SEEK_SET) != 0)
+  if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0)
+    return NULL;
+
+  sec_size = sect->size;
+  debug_section = (char *) _bfd_alloc_and_read (abfd, sec_size, sec_size);
+  if (debug_section == NULL)
+    return NULL;
+
+  if (bfd_seek (abfd, position, SEEK_SET) != 0)

     return NULL;
 
   * sect_return = sect;
     return NULL;
 
   * sect_return = sect;


@@ -1637,50 +1629,28 @@ copy_name (bfd *abfd, char *name, size_t maxlen)
 bfd_boolean
 _bfd_coff_get_external_symbols (bfd *abfd)
 {
 bfd_boolean
 _bfd_coff_get_external_symbols (bfd *abfd)
 {

-  bfd_size_type symesz;
-  bfd_size_type size;
+  size_t symesz;
+  size_t size;

   void * syms;
 
   if (obj_coff_external_syms (abfd) != NULL)
     return TRUE;
 
   symesz = bfd_coff_symesz (abfd);
   void * syms;
 
   if (obj_coff_external_syms (abfd) != NULL)
     return TRUE;
 
   symesz = bfd_coff_symesz (abfd);

-
-  size = obj_raw_syment_count (abfd) * symesz;
-  if (size == 0)
-    return TRUE;
-  /* Check for integer overflow and for unreasonable symbol counts.  */
-  if (size < obj_raw_syment_count (abfd)
-      || (bfd_get_file_size (abfd) > 0
-         && size > bfd_get_file_size (abfd)))
-
-    {
-      _bfd_error_handler (_("%pB: corrupt symbol count: %#" PRIx64 ""),
-                         abfd, (uint64_t) obj_raw_syment_count (abfd));
-      return FALSE;
-    }
-
-  syms = bfd_malloc (size);
-  if (syms == NULL)
+  if (_bfd_mul_overflow (obj_raw_syment_count (abfd), symesz, &size))

     {
     {

-      /* PR 21013: Provide an error message when the alloc fails.  */
-      _bfd_error_handler (_("%pB: not enough memory to allocate space "
-                           "for %#" PRIx64 " symbols of size %#" PRIx64),
-                         abfd, (uint64_t) obj_raw_syment_count (abfd),
-                         (uint64_t) symesz);
+      bfd_set_error (bfd_error_file_truncated);

       return FALSE;
     }
 
       return FALSE;
     }
 

-  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
-      || bfd_bread (syms, size, abfd) != size)
-    {
-      if (syms != NULL)
-       free (syms);
-      return FALSE;
-    }
+  if (size == 0)
+    return TRUE;

 
 

+  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
+    return FALSE;
+  syms = _bfd_malloc_and_read (abfd, size, size);

   obj_coff_external_syms (abfd) = syms;
   obj_coff_external_syms (abfd) = syms;

-  return TRUE;
+  return syms != NULL;

 }
 
 /* Read in the external strings.  The strings are not loaded until
 }
 
 /* Read in the external strings.  The strings are not loaded until


@@ -1696,6 +1666,7 @@ _bfd_coff_read_string_table (bfd *abfd)
   bfd_size_type strsize;
   char *strings;
   file_ptr pos;
   bfd_size_type strsize;
   char *strings;
   file_ptr pos;

+  ufile_ptr filesize;

 
   if (obj_coff_strings (abfd) != NULL)
     return obj_coff_strings (abfd);
 
   if (obj_coff_strings (abfd) != NULL)
     return obj_coff_strings (abfd);


@@ -1729,7 +1700,9 @@ _bfd_coff_read_string_table (bfd *abfd)
 #endif
     }
 
 #endif
     }
 

-  if (strsize < STRING_SIZE_SIZE || strsize > bfd_get_file_size (abfd))
+  filesize = bfd_get_file_size (abfd);
+  if (strsize < STRING_SIZE_SIZE
+      || (filesize != 0 && strsize > filesize))

     {
       _bfd_error_handler
        /* xgettext: c-format */
     {
       _bfd_error_handler
        /* xgettext: c-format */


@@ -1871,10 +1844,13 @@ coff_get_normalized_symtab (bfd *abfd)
        }
     }
 
        }
     }
 

-  /* Free the raw symbols, but not the strings (if we have them).  */
-  obj_coff_keep_strings (abfd) = TRUE;
-  if (! _bfd_coff_free_symbols (abfd))
-    return NULL;
+  /* Free the raw symbols.  */
+  if (obj_coff_external_syms (abfd) != NULL
+      && ! obj_coff_keep_syms (abfd))
+    {
+      free (obj_coff_external_syms (abfd));
+      obj_coff_external_syms (abfd) = NULL;
+    }

 
   for (internal_ptr = internal; internal_ptr < internal_end;
        internal_ptr++)
 
   for (internal_ptr = internal; internal_ptr < internal_end;
        internal_ptr++)


@@ -2020,7 +1996,7 @@ coff_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
 asymbol *
 coff_make_empty_symbol (bfd *abfd)
 {
 asymbol *
 coff_make_empty_symbol (bfd *abfd)
 {

-  bfd_size_type amt = sizeof (coff_symbol_type);
+  size_t amt = sizeof (coff_symbol_type);

   coff_symbol_type *new_symbol = (coff_symbol_type *) bfd_zalloc (abfd, amt);
 
   if (new_symbol == NULL)
   coff_symbol_type *new_symbol = (coff_symbol_type *) bfd_zalloc (abfd, amt);
 
   if (new_symbol == NULL)


@@ -2041,7 +2017,7 @@ coff_bfd_make_debug_symbol (bfd *abfd,
                            void * ptr ATTRIBUTE_UNUSED,
                            unsigned long sz ATTRIBUTE_UNUSED)
 {
                            void * ptr ATTRIBUTE_UNUSED,
                            unsigned long sz ATTRIBUTE_UNUSED)
 {

-  bfd_size_type amt = sizeof (coff_symbol_type);
+  size_t amt = sizeof (coff_symbol_type);

   coff_symbol_type *new_symbol = (coff_symbol_type *) bfd_alloc (abfd, amt);
 
   if (new_symbol == NULL)
   coff_symbol_type *new_symbol = (coff_symbol_type *) bfd_alloc (abfd, amt);
 
   if (new_symbol == NULL)


@@ -2266,7 +2242,7 @@ coff_find_nearest_line_with_names (bfd *abfd,
   combined_entry_type *pend;
   alent *l;
   struct coff_section_tdata *sec_data;
   combined_entry_type *pend;
   alent *l;
   struct coff_section_tdata *sec_data;

-  bfd_size_type amt;
+  size_t amt;

 
   /* Before looking through the symbol table, try to use a .stab
      section to find the information.  */
 
   /* Before looking through the symbol table, try to use a .stab
      section to find the information.  */


@@ -2589,7 +2565,7 @@ bfd_coff_set_symbol_class (bfd *   abfd,
         coff_write_alien_symbol().  */
 
       combined_entry_type * native;
         coff_write_alien_symbol().  */
 
       combined_entry_type * native;

-      bfd_size_type amt = sizeof (* native);
+      size_t amt = sizeof (* native);

 
       native = (combined_entry_type *) bfd_zalloc (abfd, amt);
       if (native == NULL)
 
       native = (combined_entry_type *) bfd_zalloc (abfd, amt);
       if (native == NULL)


@@ -3169,8 +3145,10 @@ _bfd_coff_close_and_cleanup (bfd *abfd)
       && bfd_family_coff (abfd)
       && coff_data (abfd) != NULL)
     {
       && bfd_family_coff (abfd)
       && coff_data (abfd) != NULL)
     {

-      obj_coff_keep_syms (abfd) = FALSE;
-      obj_coff_keep_strings (abfd) = FALSE;
+      /* PR 25447:
+        Do not clear the keep_syms and keep_strings flags.
+        These may have been set by pe_ILF_build_a_bfd() indicating
+        that the syms and strings pointers are not to be freed.  */

       if (!_bfd_coff_free_symbols (abfd))
        return FALSE;
     }
       if (!_bfd_coff_free_symbols (abfd))
        return FALSE;
     }