Make all callers of malloc or realloc (including via obstacks)

	check the result for NULL.  Most set bfd_error to no_memory and
	return in that case; a few are harder to fix, and are marked
	with "FIXME <return type>".

	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub
	hppa_elf_build_long_branch_stub):  Check bfd_make_empty_symbol return.
	* linker.c (_bfd_generic_link_output_symbols
	_bfd_generic_link_write_global_symbol): Ditto
	* section.c (bfd_make_section_anyway): Ditto.

	* tekhex.c (find_chunk tekhex_mkobject): Check bfd_alloc.
	(first_phase): Ditto.  FIXME void
	(tekhex_make_empty_symbol): Check bfd_zalloc.

	* sunos.c (sunos_read_dynamic_info): Check bfd_zalloc.
	(MY(read_dynamic_symbols) MY(read_dynamic_relocs)): Check bfd_alloc.

	* stringhash.c (_bfd_stringtab_hash_newfunc): Check bfd_hash_allocate.

	* srec.c: Indent.
	(fillup_symbols): Check bfd_alloc.  FIXME void
	(srec_mkobject srec_get_section_contents
	srec_set_section_contents): Check bfd_alloc.
	(srec_make_empty_symbol): Check bfd_zalloc.

	* som.c (hppa_som_gen_reloc_type): Check bfd_alloc_by_size_t.
	(make_unique_section): Check bfd_alloc.
	(som_new_section_hook): Check bfd_zalloc.
	(bfd_som_attach_aux_hdr): Ditto.  FIXME void

	* rs6000-core.c (rs6000coff_core_p): Check bfd_zalloc.

	* osf-core.c (osf_core_make_empty_symbol): Check bfd_zalloc.
	(osf_core_core_file_p): Check bfd_alloc.

	* oasys.c (oasys_slurp_symbol_table oasys_archive_p
	oasys_mkobject oasys_object_p oasys_new_section_hook
	oasys_set_section_contents): Check bfd_alloc.
	(oasys_slurp_section_data): Check bfd_zalloc and bfd_alloc.
	(oasys_make_empty_symbol): Check bfd_zalloc.

	* nlmcode.h (nlm_make_empty_symbol): Check bfd_zalloc.
	(nlm_slurp_symbol_table): Check bfd_zalloc and bfd_alloc.

	* nlm32-sparc.c (nlm_sparc_read_import): Check bfd_alloc.

	* nlm32-i386.c (nlm_i386_read_import): Check bfd_alloc.

	* nlm32-alpha.c (nlm_alpha_read_import): Check bfd_alloc.

	* linker.c (_bfd_link_hash_newfunc
	(generic_link_hash_newfunc
	(archive_hash_newfunc
	(_bfd_generic_link_add_one_symbol): Check bfd_hash_allocate.
	(_bfd_generic_final_link
	(_bfd_generic_link_output_symbols
	(default_indirect_link_order): Check bfd_alloc.
	(bfd_new_link_order): Check bfd_alloc_by_size_t.

	* irix-core.c (irix_core_make_empty_symbol): Check bfd_zalloc.

	* ieee.c: Indent.
	(read_id get_symbol get_section_entry ieee_archive_p ieee_object_p
	ieee_slurp_section_data ieee_new_section_hook): Check bfd_alloc.
	(do_one): Check bfd_alloc.  Return a boolean.
	(ieee_slurp_section_data): Check it.
	(init_for_output): Check bfd_alloc.  Return a boolean.
	(ieee_set_section_contents): Check it.
	(do_with_relocs):  Check bfd_alloc.  Return a boolean.
	(ieee_bfd_debug_info_accumulate): Ditto.  FIXME void.
	(ieee_mkobject): Check bfd_zalloc.
	(ieee_make_empty_symbol): Check bfd_zmalloc.

	* hpux-core.c (hpux_core_make_empty_symbol): Check
	bfd_zalloc.

	* hppabsd-core.c (hppabsd_core_make_empty_symbol): Check
	bfd_zalloc.
	(hppabsd_core_core_file_p): Check bfd_zalloc.

	* hp300hpux.c (MY(slurp_symbol_table)): Check bfd_alloc.

	* elfcode.h (elf_new_section_hook): Check bfd_alloc.
	(bfd_section_from_phdr): Ditto.
	(write_relocs): Ditto.  FIXME void
	(elf_map_symbols assign_section_numbers map_program_segments):
	Ditto.  Return a boolean.
	(swap_out_syms): Ditto.  Check elf_map_symbols.
	(elf_slurp_symbol_table): Check bfd_zalloc.
	(elf_slurp_reloca_table): Check bfd_alloc.
	(elf_slurp_reloc_table): Ditto.
	(elf_compute_section_file_positions): Check assign_section_numbers.
	(assign_file_positions_except_relocs): Return a boolean.
	Check map_program_segments.
	(elf_compute_section_file_positions): Check it.

	* elf32-mips.c (mips_elf_final_link): Check bfd_alloc.

	* elf32-hppa.c (hppa_elf_stub_branch_reloc): Check bfd_zmalloc and
	realloc.
	(hppa_elf_stub_reloc): Ditto.
	(hppa_elf_build_arg_reloc_stub): Check bfd_zalloc.
	(hppa_elf_build_long_branch_stub): Ditto.
	(elf32_hppa_backend_symbol_table_processing): Ditto.

	* ecoff.c (ecoff_set_symbol_info): Check bfd_alloc.  Return a boolean.
	(ecoff_slurp_symbol_table): Check it.
	(ecoff_slurp_armap): Check bfd_alloc.
	(ecoff_write_armap): Check bfd_zalloc.
	(ecoff_link_hash_newfunc): Check bfd_hash_allocate and
	_bfd_link_hash_newfunc.
	(ecoff_link_add_externals): Check bfd_alloc.

	* ctor.c (bfd_constructor_entry): Check bfd_alloc.

	* coffgen.c (coff_real_object_p): Check bfd_alloc.
	(coff_renumber_symbols): Check bfd_alloc_by_size_t.  Return a boolean.
	(coff_write_symbol): Check bfd_alloc.  FIXME int
	(coff_write_linenumbers): Check bfd_alloc.  Return a boolean.
	(coff_section_symbol): Check bfd_alloc_by_size_t.
	(coff_get_normalized_symtab): Check bfd_alloc.
	(coff_bfd_make_debug_symbol): Check bfd_zalloc.
	* libcoff-in.h: Change decls of coff_renumber_symbols,
	coff_write_linenumbers.
	* libcoff.h: Rebuilt.
	* coffcode.h (coff_write_object_contents): Check
	coff_renumber_symbols, coff_write_linenumbers.

	* coffcode.h: Indent.
	(coff_add_missing_symbols): Check bfd_alloc_by_size_t.  Return a
	boolean.
	(coff_write_object_contents): Check it.

	* coff-alpha.c (alpha_relocate_section): Check bfd_alloc.
	* coff-mips.c (mips_relocate_section): Ditto.

	* archive.c (bfd_slurp_bsd_armap_f2): Check bfd_alloc value.
	(do_slurp_bsd_armap): Ditto.
	(compute_and_write_armap): Check bfd_realloc value.

	* aoutx.h (translate_from_native_sym_flags): Check bfd_alloc
	return value.  Return boolean value.
	(NAME(aout,make_empty_symbol)): Check bfd_zalloc return value.
	(NAME(aout,slurp_symbol_table)): Check bf_alloc and bfd_zalloc
	return value.
	(add_to_stringtab): Ditto.  FIXME void
	(aout_link_hash_newfunc): Check bfd_hash_allocate return value.
	(aout_link_add_symbols): Check bfd_alloc value.
	(translate_symbol_table): Check translate_from_native_sym_flags.
	* hp300hpux.c (MY(slurp_symbol_table)): Ditto.
	* aoutx.h (aout_link_hash_newfunc): Check _bfd_link_hash_newfunc.

	* opncls.c (bfd_zalloc bfd_realloc): Check result of bfd_alloc.

	* opncls.c (obstack_chunk_alloc): Define as malloc, not
	bfd_xmalloc_by_size_t.
	(_bfd_new_bfd): Check obstack_begin for 0 return.

	* ieee.c (obstack_chunk_alloc): Define as malloc, not
	bfd_xmalloc_by_size_t.
	(ieee_archive_p): Check obstack_begin for 0 return and
	obstack_finish for NULL return.

	* hash.c (obstack_chunk_alloc): Define as malloc, not
	bfd_xmalloc_by_size_t.
	(bfd_hash_table_init_n): Check obstack_begin for 0 return and
	obstack_finish for NULL return.
	(bfd_hash_lookup): Check obstack_alloc for NULL return.

	* ecofflink.c (obstack_chunk_alloc): Define as malloc, not
	bfd_xmalloc_by_size_t.
	bfd_ecoff_debug_accumulate
	bfd_ecoff_debug_accumulate_other): Check obstack_alloc.
	(add_file_shuffle add_memory_shuffle): Check obstack_alloc for
	NULL return.  Return boolean, not void.
	(bfd_ecoff_debug_init): Check obstack_begin for 0 return.
	(bfd_ecoff_debug_accumulate): Check add_file_shuffle
	and add_memory_shuffle return.
	(string_hash_newfunc): Check bfd_hash_allocate and bfd_hash_newfunc.
	(bfd_ecoff_debug_accumulate): Check bfd_alloc.
	(ecoff_add_string): Check add_memory_shuffle return.

	* libbfd-in.h (xmalloc, bfd_xmalloc, bfd_xmalloc_by_size_t):
	Remove decls.
	* libbfd.h: Rebuilt.

1 files changed, 95 insertions, 17 deletions

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index b2b99d3..b5c8d0b 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -132,7 +132,7 @@ static boolean elf_slurp_symbol_table PARAMS ((bfd *, asymbol **));
 static int elf_symbol_from_bfd_symbol PARAMS ((bfd *,
 					       struct symbol_cache_entry **));
 
-static void elf_map_symbols PARAMS ((bfd *));
+static boolean elf_map_symbols PARAMS ((bfd *));
 static boolean swap_out_syms PARAMS ((bfd *));
 
 #ifdef DEBUG
@@ -412,7 +412,7 @@ DEFUN (bfd_add_to_strtab, (abfd, ss, str),
   /* should this be using obstacks? */
   ss->tab = realloc (ss->tab, ss->length + ln);
 
-  BFD_ASSERT (ss->tab != 0);
+  BFD_ASSERT (ss->tab != 0);	/* FIXME */
   strcpy (ss->tab + ss->length, str);
   ss->nentries++;
   ss->length += ln;
@@ -437,7 +437,7 @@ DEFUN (bfd_add_2_to_strtab, (abfd, ss, str, str2),
   else
     ss->tab = malloc (ln);
 
-  BFD_ASSERT (ss->tab != 0);
+  BFD_ASSERT (ss->tab != 0);	/* FIXME */
   strcpy (ss->tab + ss->length, str);
   strcpy (ss->tab + ss->length + strlen (str), str2);
   ss->nentries++;
@@ -596,8 +596,8 @@ DEFUN (bfd_section_from_shdr, (abfd, shindex),
 	  newsect->flags = SEC_HAS_CONTENTS;
 	  hdr->rawdata = (PTR) newsect;
 	  newsect->_raw_size = hdr->sh_size;
-	  newsect->alignment_power = 0;
-	  newsect->vma = 0;
+	  newsect->alignment_power = bfd_log2 (hdr->sh_addralign);
+	  newsect->vma = hdr->sh_addr;
 	  newsect->filepos = hdr->sh_offset;
 
 	  if (hdr->sh_flags & SHF_ALLOC)
@@ -710,6 +710,11 @@ DEFUN (elf_new_section_hook, (abfd, sec),
   struct bfd_elf_section_data *sdata;
 
   sdata = (struct bfd_elf_section_data *) bfd_alloc (abfd, sizeof (*sdata));
+  if (!sdata)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   sec->used_by_bfd = (PTR) sdata;
   memset (sdata, 0, sizeof (*sdata));
   return true;
@@ -753,6 +758,11 @@ DEFUN (bfd_section_from_phdr, (abfd, hdr, index),
 	   (hdr->p_memsz > hdr->p_filesz));
   sprintf (namebuf, split ? "segment%da" : "segment%d", index);
   name = bfd_alloc (abfd, strlen (namebuf) + 1);
+  if (!name)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   strcpy (name, namebuf);
   newsect = bfd_make_section (abfd, name);
   newsect->vma = hdr->p_vaddr;
@@ -779,6 +789,11 @@ DEFUN (bfd_section_from_phdr, (abfd, hdr, index),
     {
       sprintf (namebuf, "segment%db", index);
       name = bfd_alloc (abfd, strlen (namebuf) + 1);
+      if (!name)
+	{
+	  bfd_error = no_memory;
+	  return false;
+	}
       strcpy (name, namebuf);
       newsect = bfd_make_section (abfd, name);
       newsect->vma = hdr->p_vaddr + hdr->p_filesz;
@@ -1149,6 +1164,11 @@ write_relocs (abfd, sec, xxx)
 
   rela_hdr->sh_size = rela_hdr->sh_entsize * sec->reloc_count;
   rela_hdr->contents = (void *) bfd_alloc (abfd, rela_hdr->sh_size);
+  if (!rela_hdr->contents)
+    {
+      bfd_error = no_memory;
+      abort();			/* FIXME */
+    }
 
   /* orelocation has the data, reloc_count has the count... */
   if (use_rela_p)
@@ -1378,7 +1398,7 @@ sym_is_global (abfd, sym)
   return 0;
 }
 
-static void
+static boolean
 DEFUN (elf_map_symbols, (abfd), bfd * abfd)
 {
   int symcount = bfd_get_symcount (abfd);
@@ -1414,11 +1434,20 @@ DEFUN (elf_map_symbols, (abfd), bfd * abfd)
   sect_syms = (asymbol **) bfd_zalloc (abfd, max_index * sizeof (asymbol *));
   elf_section_syms (abfd) = sect_syms;
 
-  BFD_ASSERT (sect_syms != 0);
+  if (sect_syms != 0)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
 
   for (asect = abfd->sections; asect; asect = asect->next)
     {
       asymbol *sym = bfd_make_empty_symbol (abfd);
+      if (!sym)
+	{
+	  bfd_error = no_memory;
+	  return false;
+	}
       sym->the_bfd = abfd;
       sym->name = asect->name;
       sym->value = asect->vma;
@@ -1442,6 +1471,11 @@ DEFUN (elf_map_symbols, (abfd), bfd * abfd)
       else
 	syms = (asymbol **) bfd_alloc (abfd,
 				       (num_sections + 1) * sizeof (asymbol *));
+      if (!syms)
+	{
+	  bfd_error = no_memory;
+	  return false;
+	}
 
       for (asect = abfd->sections; asect; asect = asect->next)
 	{
@@ -1455,6 +1489,11 @@ DEFUN (elf_map_symbols, (abfd), bfd * abfd)
 
   elf_sym_extra (abfd) = sym_extra
     = (Elf_Sym_Extra *) bfd_alloc (abfd, symcount * sizeof (Elf_Sym_Extra));
+  if (!sym_extra)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
 
   /* Identify and classify all of the symbols.  */
   for (idx = 0; idx < symcount; idx++)
@@ -1478,17 +1517,19 @@ DEFUN (elf_map_symbols, (abfd), bfd * abfd)
 
   elf_num_locals (abfd) = num_locals;
   elf_num_globals (abfd) = num_globals;
+  return true;
 }
 
-static void assign_section_numbers ();
-static void assign_file_positions_except_relocs ();
+static boolean assign_section_numbers ();
+static boolean assign_file_positions_except_relocs ();
 
 static boolean
 DEFUN (elf_compute_section_file_positions, (abfd), bfd * abfd)
 {
   bfd_map_over_sections (abfd, elf_fake_sections, 0);
 
-  assign_section_numbers (abfd);
+  if (!assign_section_numbers (abfd))
+    return false;
 
   bfd_map_over_sections (abfd, elf_make_sections, 0);
 
@@ -1497,7 +1538,8 @@ DEFUN (elf_compute_section_file_positions, (abfd), bfd * abfd)
   if (swap_out_syms (abfd) == false)
     return false;
 
-  assign_file_positions_except_relocs (abfd);
+  if (!assign_file_positions_except_relocs (abfd))
+    return false;
 
   return true;
 }
@@ -1531,7 +1573,7 @@ static const Elf_Internal_Shdr null_shdr;
    too.  The link/info pointers for the standard section types are filled
    in here too, while we're at it.  (Link pointers for .stab sections are
    not filled in here.)  */
-static void
+static boolean
 assign_section_numbers (abfd)
      bfd *abfd;
 {
@@ -1573,6 +1615,11 @@ assign_section_numbers (abfd)
      indices.  */
   i_shdrp = (Elf_Internal_Shdr **)
     bfd_alloc (abfd, section_number * sizeof (Elf_Internal_Shdr *));
+  if (!i_shdrp)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   elf_elfsections(abfd) = i_shdrp;
   for (i = 0; i < section_number; i++)
     i_shdrp[i] = 0;
@@ -1595,6 +1642,7 @@ assign_section_numbers (abfd)
   for (i = 0; i < section_number; i++)
     if (i_shdrp[i] == 0)
       abort ();
+  return true;
 }
 
 static INLINE file_ptr
@@ -1645,7 +1693,7 @@ struct seg_info {
   struct seg_info *next;
 };
 
-static void
+static boolean
 map_program_segments (abfd)
      bfd *abfd;
 {
@@ -1708,6 +1756,11 @@ map_program_segments (abfd)
       {
 	struct seg_info *s;
 	s = (struct seg_info *) bfd_alloc (abfd, sizeof (struct seg_info));
+	if (!s)
+	  {
+	    bfd_error = no_memory;
+	    return false;
+	  }
 	s->next = seg;
 	seg = s;
       }
@@ -1787,6 +1840,11 @@ map_program_segments (abfd)
       }
     phdr = (Elf_Internal_Phdr*) bfd_alloc (abfd,
 					   n_segs * sizeof (Elf_Internal_Phdr));
+    if (!phdr)
+      {
+	bfd_error = no_memory;
+	abort();		/* FIXME */
+      }
     elf_tdata (abfd)->phdr = phdr;
     while (seg)
       {
@@ -1810,9 +1868,10 @@ map_program_segments (abfd)
     i_ehdrp->e_phnum = n_segs;
   }
   elf_write_phdrs (abfd, i_ehdrp, elf_tdata (abfd)->phdr, i_ehdrp->e_phnum);
+  return true;
 }
 
-static void
+static boolean
 assign_file_positions_except_relocs (abfd)
      bfd *abfd;
 {
@@ -1912,7 +1971,8 @@ assign_file_positions_except_relocs (abfd)
   if (exec_p)
     {
       elf_tdata (abfd)->next_file_pos = off;
-      map_program_segments (abfd);
+      if (!map_program_segments (abfd))
+	return false;
       off = elf_tdata (abfd)->next_file_pos;
 
       /* Section headers.  */
@@ -1932,6 +1992,7 @@ assign_file_positions_except_relocs (abfd)
 	}
     }
   elf_tdata (abfd)->next_file_pos = off;
+  return true;
 }
 
 static boolean
@@ -2048,7 +2109,8 @@ static boolean
 swap_out_syms (abfd)
      bfd *abfd;
 {
-  elf_map_symbols (abfd);
+  if (!elf_map_symbols (abfd))
+    return false;
 
   /* Dump out the symtabs. */
   {
@@ -2079,6 +2141,11 @@ swap_out_syms (abfd)
 
     outbound_syms = (Elf_External_Sym *)
       bfd_alloc (abfd, (1 + symcount) * sizeof (Elf_External_Sym));
+    if (!outbound_syms)
+      {
+	bfd_error = no_memory;
+	return false;
+      }
     /* now generate the data (for "contents") */
     {
       /* Fill in zeroth symbol and swap it out.  */
@@ -2527,7 +2594,7 @@ DEFUN (elf_slurp_symbol_table, (abfd, symptrs),
 
   /* Temporarily allocate room for the raw ELF symbols.  */
   x_symp = (Elf_External_Sym *) malloc (symcount * sizeof (Elf_External_Sym));
-  if (!x_symp)
+  if (!symbase || !x_symp)
     {
       bfd_error = no_memory;
       return false;
@@ -2705,6 +2772,12 @@ DEFUN (elf_slurp_reloca_table, (abfd, asect, symbols),
   bfd_seek (abfd, asect->rel_filepos, SEEK_SET);
   native_relocs = (Elf_External_Rela *)
     bfd_alloc (abfd, asect->reloc_count * sizeof (Elf_External_Rela));
+  if (!native_relocs)
+  if (!reloc_cache)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   bfd_read ((PTR) native_relocs,
 	    sizeof (Elf_External_Rela), asect->reloc_count, abfd);
 
@@ -2847,6 +2920,11 @@ DEFUN (elf_slurp_reloc_table, (abfd, asect, symbols),
   bfd_seek (abfd, asect->rel_filepos, SEEK_SET);
   native_relocs = (Elf_External_Rel *)
     bfd_alloc (abfd, asect->reloc_count * sizeof (Elf_External_Rel));
+  if (!native_relocs)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   bfd_read ((PTR) native_relocs,
 	    sizeof (Elf_External_Rel), asect->reloc_count, abfd);