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, 72 insertions, 17 deletions

diff --git a/bfd/oasys.c b/bfd/oasys.c
index f144192..adad8bf 100644
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -33,6 +33,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define offsetof(type, identifier) (size_t) &(((type *) 0)->identifier) 
 #endif
 
+static boolean oasys_write_sections PARAMS ((bfd *));
+
 /* Read in all the section data and relocation stuff too */
 PROTO(static boolean,oasys_slurp_section_data,(bfd *CONST abfd));
 
@@ -99,7 +101,11 @@ DEFUN(oasys_slurp_symbol_table,(abfd),
 #else
   data->strings = bfd_alloc(abfd, data->symbol_string_length);
 #endif
-
+  if (!data->symbols || !data->strings)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
 
   dest_defined = data->symbols + abfd->symcount -1;
 
@@ -267,9 +273,14 @@ DEFUN(oasys_archive_p,(abfd),
       oasys_module_info_type *module = 
 	(oasys_module_info_type*)
 	  bfd_alloc(abfd, sizeof(oasys_module_info_type) * header.mod_count);
-
       oasys_module_table_type record;
 
+      if (!ar || !module)
+	{
+	  bfd_error = no_memory;
+	  return NULL;
+	}
+
       abfd->tdata.oasys_ar_data = ar;
       ar->module = module;
       ar->module_count = header.mod_count;
@@ -292,6 +303,11 @@ DEFUN(oasys_archive_p,(abfd),
 	  record.sect_count = bfd_h_get_32(abfd, record_ext.sect_count);
 
 	  module[i].name = bfd_alloc(abfd,33);
+	  if (!module[i].name)
+	    {
+	      bfd_error = no_error;
+	      return NULL;
+	    }
 
 	  memcpy(module[i].name, record_ext.mod_name, 33);
 	  filepos +=
@@ -313,6 +329,11 @@ DEFUN(oasys_archive_p,(abfd),
 	  record.module_name_size = bfd_h_get_32(abfd, record_ext.mod_name_length);
 
 	  module[i].name = bfd_alloc(abfd,record.module_name_size + 1);
+	  if (!module[i].name)
+	    {
+	      bfd_error = no_error;
+	      return NULL;
+	    }
 	  bfd_read((PTR)module[i].name, 1, record.module_name_size, abfd);
 	  module[i].name[record.module_name_size] = 0;
 	  filepos +=
@@ -338,7 +359,7 @@ DEFUN(oasys_mkobject,(abfd),
 {
 
   abfd->tdata.oasys_obj_data =    (oasys_data_type*)bfd_alloc(abfd, sizeof(oasys_data_type));
-  return true;
+  return abfd->tdata.oasys_obj_data ? true : false;
 }
 
 #define MAX_SECS 16
@@ -391,6 +412,11 @@ DEFUN(oasys_object_p,(abfd),
 		goto fail;
 	      }
 	  buffer = bfd_alloc(abfd, 3);
+	  if (!buffer)
+	    {
+	      bfd_error = no_memory;
+	      goto fail;
+	    }
 	  section_number= record.section.relb & RELOCATION_SECT_BITS;
 	  sprintf(buffer,"%u", section_number);
 	  s = bfd_make_section(abfd,buffer);
@@ -548,6 +574,11 @@ DEFUN(oasys_slurp_section_data,(abfd),
 	      if (per->initialized == false) 
 		  {
 		    per->data = (bfd_byte *) bfd_zalloc(abfd, section->_raw_size);
+		    if (!per->data)
+		      {
+			bfd_error = no_memory;
+			return false;
+		      }
 		    per->reloc_tail_ptr = (oasys_reloc_type **)&(section->relocation);
 		    per->had_vma = false;
 		    per->initialized = true;
@@ -607,6 +638,11 @@ DEFUN(oasys_slurp_section_data,(abfd),
 				      (oasys_reloc_type *)
 					bfd_alloc(abfd,
 						  sizeof(oasys_reloc_type));
+				    if (!r)
+				      {
+					bfd_error = no_memory;
+					return false;
+				      }
 				    *(per->reloc_tail_ptr) = r;
 				    per->reloc_tail_ptr = &r->next;
 				    r->next= (oasys_reloc_type *)NULL;
@@ -648,6 +684,11 @@ DEFUN(oasys_slurp_section_data,(abfd),
 				      (oasys_reloc_type *)
 					bfd_alloc(abfd,
 						  sizeof(oasys_reloc_type));
+				    if (!r)
+				      {
+					bfd_error = no_memory;
+					return false;
+				      }
 				    *(per->reloc_tail_ptr) = r;
 				    per->reloc_tail_ptr = &r->next;
 				    r->next= (oasys_reloc_type *)NULL;
@@ -704,10 +745,6 @@ DEFUN(oasys_slurp_section_data,(abfd),
 
 }
 
-
-
-extern bfd_error_vector_type bfd_error_vector;
-
 static boolean
 DEFUN(oasys_new_section_hook,(abfd, newsect),
       bfd *abfd AND
@@ -715,6 +752,11 @@ DEFUN(oasys_new_section_hook,(abfd, newsect),
 {
   newsect->used_by_bfd = (PTR)
     bfd_alloc(abfd, sizeof(oasys_per_section_type));
+  if (!newsect->used_by_bfd)
+    {
+      bfd_error = no_memory;
+      return false;
+    }
   oasys_per_section( newsect)->data = (bfd_byte *)NULL;
   oasys_per_section(newsect)->section = newsect;
   oasys_per_section(newsect)->offset  = 0;
@@ -897,9 +939,9 @@ DEFUN(oasys_write_syms, (abfd),
 
 
   /* Write a section header for each section */
-static void 
-DEFUN(oasys_write_sections, (abfd),
-      bfd *CONST abfd)
+static boolean
+oasys_write_sections (abfd)
+     bfd *abfd;
 {
   asection *s;
   static oasys_section_record_type out;
@@ -907,8 +949,8 @@ DEFUN(oasys_write_sections, (abfd),
   for (s = abfd->sections; s != (asection *)NULL; s = s->next) {
     if (!isdigit(s->name[0])) 
 	{
-          bfd_error_vector.nonrepresentable_section(abfd,
-						    s->name);
+	  bfd_error = nonrepresentable_section;
+	  return false;
 	}
     out.relb = RELOCATION_TYPE_REL | s->target_index;
     bfd_h_put_32(abfd, s->_cooked_size, out.value);
@@ -919,6 +961,7 @@ DEFUN(oasys_write_sections, (abfd),
 		       (oasys_record_union_type *) &out,
 		       sizeof(out));
   }
+  return true;
 }
 
 static void
@@ -1032,7 +1075,7 @@ DEFUN(oasys_write_data, (abfd),
 
 		if (relocs_to_go != 0) {	
 		  arelent *r = *p;
-		  reloc_howto_type *CONST how=r->howto;
+		  const reloc_howto_type * const how=r->howto;
 		  /* There is a relocation, is it for this byte ? */
 		  if (r->address == current_byte_index) {
 		    unsigned char rel_byte;
@@ -1152,7 +1195,8 @@ DEFUN(oasys_write_object_contents, (abfd),
 {
   oasys_write_header(abfd);
   oasys_write_syms(abfd);
-  oasys_write_sections(abfd);
+  if (! oasys_write_sections(abfd))
+    return false;
   oasys_write_data(abfd);
   oasys_write_end(abfd);
   return true;
@@ -1179,6 +1223,11 @@ DEFUN(oasys_set_section_contents,(abfd, section, location, offset, count),
 	{
 	  oasys_per_section(section)->data =
 	    (bfd_byte *)(bfd_alloc(abfd,section->_cooked_size));    
+	  if (!	  oasys_per_section(section)->data)
+	    {
+	      bfd_error = no_memory;
+	      return false;
+	    }
 	}
     (void) memcpy((PTR)(oasys_per_section(section)->data + offset),
 		  location,
@@ -1202,9 +1251,13 @@ DEFUN(oasys_make_empty_symbol,(abfd),
 
   oasys_symbol_type  *new =
     (oasys_symbol_type *)bfd_zalloc (abfd, sizeof (oasys_symbol_type));
+  if (!new)
+    {
+      bfd_error = no_memory;
+      return NULL;
+    }
   new->symbol.the_bfd = abfd;
   return &new->symbol;
-
 }
 
 
@@ -1306,11 +1359,13 @@ return 0;
 #define oasys_bfd_debug_info_accumulate  (FOO(void, (*), (bfd *, asection *)))bfd_void
 #define oasys_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
 #define oasys_bfd_relax_section bfd_generic_relax_section
-#define oasys_bfd_seclet_link bfd_generic_seclet_link
 #define oasys_bfd_reloc_type_lookup \
   ((CONST struct reloc_howto_struct *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
 #define oasys_bfd_make_debug_symbol \
   ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
+#define oasys_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define oasys_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define oasys_bfd_final_link _bfd_generic_final_link
 
 /*SUPPRESS 460 */
 bfd_target oasys_vec =
@@ -1321,7 +1376,7 @@ bfd_target oasys_vec =
   true,				/* target headers byte order */
   (HAS_RELOC | EXEC_P |		/* object flags */
    HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
   (SEC_CODE|SEC_DATA|SEC_ROM|SEC_HAS_CONTENTS
    |SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
    0,				/* leading underscore */