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, 106 insertions, 48 deletions

diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
index 358bc40..17d3a1a 100644
--- a/bfd/nlm32-alpha.c
+++ b/bfd/nlm32-alpha.c
@@ -96,6 +96,7 @@ nlm_alpha_write_prefix (abfd)
       bfd_error = system_call_error;
       return false;
     }
+  return true;
 }
 
 /* How to process the various reloc types.  */
@@ -469,13 +470,13 @@ nlm_alpha_read_reloc (abfd, sym, secp, rel)
 	  rel->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
 	  rel->addend = 0;
 	}
-      else if (r_symndx == RELOC_SECTION_TEXT)
+      else if (r_symndx == ALPHA_RELOC_SECTION_TEXT)
 	{
 	  rel->sym_ptr_ptr = code_sec->symbol_ptr_ptr;
 	  BFD_ASSERT (bfd_get_section_vma (abfd, code_sec) == 0);
 	  rel->addend = 0;
 	}
-      else if (r_symndx == RELOC_SECTION_DATA)
+      else if (r_symndx == ALPHA_RELOC_SECTION_DATA)
 	{
 	  rel->sym_ptr_ptr = data_sec->symbol_ptr_ptr;
 	  rel->addend = - bfd_get_section_vma (abfd, data_sec);
@@ -573,14 +574,23 @@ nlm_alpha_read_reloc (abfd, sym, secp, rel)
       break;
 
     case ALPHA_R_NW_RELOC:
+      /* If this is SETGP, we set the addend to 0.  Otherwise we set
+	 the addend to the size of the .lita section (this is
+	 r_symndx) plus 1.  We have already set the address of the
+	 reloc to r_vaddr.  */
       if (r_size == ALPHA_R_NW_RELOC_SETGP)
-	gp_value = r_vaddr;
+	{
+	  gp_value = r_vaddr;
+	  rel->addend = 0;
+	}
       else if (r_size == ALPHA_R_NW_RELOC_LITA)
-	lita_address = r_vaddr;
+	{
+	  lita_address = r_vaddr;
+	  rel->addend = r_symndx + 1;
+	}
       else
 	BFD_ASSERT (0);
       rel->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
-      rel->addend = r_size;
       break;
 
     default:
@@ -628,6 +638,11 @@ nlm_alpha_read_import (abfd, sym)
     }
   sym -> symbol.the_bfd = abfd;
   sym -> symbol.name = bfd_alloc (abfd, symlength + 1);
+  if (!sym -> symbol.name)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   if (bfd_read ((PTR) sym -> symbol.name, symlength, 1, abfd)
       != symlength)
     {
@@ -645,6 +660,11 @@ nlm_alpha_read_import (abfd, sym)
   rcount = bfd_h_get_32 (abfd, temp);
   nlm_relocs = ((struct nlm_relent *)
 		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
+  if (!nlm_relocs)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   sym -> relocs = nlm_relocs;
   sym -> rcnt = 0;
   while (sym -> rcnt < rcount)
@@ -680,52 +700,72 @@ nlm_alpha_write_import (abfd, sec, rel)
   sym = *rel->sym_ptr_ptr;
 
   /* Get values for the relocation fields.  */
-  r_vaddr = bfd_get_section_vma (abfd, sec) + rel->address;
-  if (bfd_get_section (sym) == &bfd_und_section)
-    {
-      r_extern = 1;
-      r_symndx = 0;
-    }
-  else
+  r_type = rel->howto->type;
+  if (r_type != ALPHA_R_NW_RELOC)
     {
-      r_extern = 0;
-      if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
-	r_symndx = RELOC_SECTION_TEXT;
+      r_vaddr = bfd_get_section_vma (abfd, sec) + rel->address;
+      if ((sec->flags & SEC_CODE) == 0)
+	r_vaddr += bfd_section_size (abfd,
+				     bfd_get_section_by_name (abfd,
+							      NLM_CODE_NAME));
+      if (bfd_get_section (sym) == &bfd_und_section)
+	{
+	  r_extern = 1;
+	  r_symndx = 0;
+	}
       else
-	r_symndx = RELOC_SECTION_DATA;
-    }
-  r_type = rel->howto->type;
-  r_offset = 0;
-  r_size = 0;
+	{
+	  r_extern = 0;
+	  if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
+	    r_symndx = ALPHA_RELOC_SECTION_TEXT;
+	  else
+	    r_symndx = ALPHA_RELOC_SECTION_DATA;
+	}
+      r_offset = 0;
+      r_size = 0;
 
-  switch (r_type)
+      switch (r_type)
+	{
+	case ALPHA_R_LITUSE:
+	case ALPHA_R_GPDISP:
+	  r_symndx = rel->addend;
+	  break;
+
+	case ALPHA_R_OP_STORE:
+	  r_size = rel->addend & 0xff;
+	  r_offset = (rel->addend >> 8) & 0xff;
+	  break;
+
+	case ALPHA_R_OP_PUSH:
+	case ALPHA_R_OP_PSUB:
+	case ALPHA_R_OP_PRSHIFT:
+	  r_vaddr = rel->addend;
+	  break;
+
+	case ALPHA_R_IGNORE:
+	  r_vaddr = rel->address;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+  else
     {
-    case ALPHA_R_LITUSE:
-    case ALPHA_R_GPDISP:
-      r_symndx = rel->addend;
-      break;
-
-    case ALPHA_R_OP_STORE:
-      r_size = rel->addend & 0xff;
-      r_offset = (rel->addend >> 8) & 0xff;
-      break;
-
-    case ALPHA_R_OP_PUSH:
-    case ALPHA_R_OP_PSUB:
-    case ALPHA_R_OP_PRSHIFT:
-      r_vaddr = rel->addend;
-      break;
-
-    case ALPHA_R_IGNORE:
+      /* r_type == ALPHA_R_NW_RELOC */
       r_vaddr = rel->address;
-      break;
-
-    case ALPHA_R_NW_RELOC:
-      r_size = rel->addend;
-      break;
-
-    default:
-      break;
+      if (rel->addend == 0)
+	{
+	  r_symndx = 0;
+	  r_size = ALPHA_R_NW_RELOC_SETGP;
+	}
+      else
+	{
+	  r_symndx = rel->addend - 1;
+	  r_size = ALPHA_R_NW_RELOC_LITA;
+	}
+      r_extern = 0;
+      r_offset = 0;
     }
 
   /* Swap out the relocation fields.  */
@@ -800,13 +840,14 @@ nlm_alpha_get_public_offset (abfd, sym)
 static boolean
 nlm_alpha_write_external (abfd, count, sym, relocs)
      bfd *abfd;
-     bfd_vma count;
+     bfd_size_type count;
      asymbol *sym;
      struct reloc_and_sec *relocs;
 {
   int i;
   bfd_byte len;
   unsigned char temp[NLM_TARGET_LONG_SIZE];
+  arelent r;
 
   len = strlen (sym->name);
   if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte))
@@ -816,13 +857,28 @@ nlm_alpha_write_external (abfd, count, sym, relocs)
       return false;
     }
 
-  bfd_put_32 (abfd, count, temp);
+  bfd_put_32 (abfd, count + 2, temp);
   if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
     {
       bfd_error = system_call_error;
       return false;
     }
 
+  /* The first two relocs for each external symbol are the .lita
+     address and the GP value.  */
+  r.sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+  r.howto = &nlm32_alpha_nw_howto;
+
+  r.address = nlm_alpha_backend_data (abfd)->lita_address;
+  r.addend = nlm_alpha_backend_data (abfd)->lita_size + 1;
+  if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false)
+    return false;
+
+  r.address = nlm_alpha_backend_data (abfd)->gp;
+  r.addend = 0;
+  if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false)
+    return false;
+
   for (i = 0; i < count; i++)
     {
       if (nlm_alpha_write_import (abfd, relocs[i].sec,
@@ -842,6 +898,7 @@ static const struct nlm_backend_data nlm32_alpha_backend =
   sizeof (struct nlm32_alpha_external_prefix_header),
   bfd_arch_alpha,
   0,
+  true, /* no uninitialized data permitted by Alpha NetWare.  */
   nlm_alpha_backend_object_p,
   nlm_alpha_write_prefix,
   nlm_alpha_read_reloc,
@@ -853,6 +910,7 @@ static const struct nlm_backend_data nlm32_alpha_backend =
   nlm_swap_fixed_header_in,
   nlm_swap_fixed_header_out,
   nlm_alpha_write_external,
+  0,	/* write_export */
 };
 
 #define TARGET_LITTLE_NAME		"nlm32-alpha"