From 9783e04a6438e7d81c48d202b2c1bfab315a91f8 Mon Sep 17 00:00:00 2001 From: David MacKenzie Date: Sat, 12 Feb 1994 00:45:54 +0000 Subject: 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 ". * 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. --- bfd/elf32-mips.c | 89 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 24 deletions(-) (limited to 'bfd/elf32-mips.c') diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index 585187a..57734bc 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -1,5 +1,5 @@ /* MIPS-specific support for 32-bit ELF - Copyright 1993 Free Software Foundation, Inc. + Copyright 1993, 1994 Free Software Foundation, Inc. Most of the information added by Ian Lance Taylor, Cygnus Support, . @@ -1061,6 +1061,7 @@ mips_elf_read_ecoff_info (abfd, section, debug) return false; \ } + READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, PTR); READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *); READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, PTR); READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, PTR); @@ -1072,7 +1073,8 @@ mips_elf_read_ecoff_info (abfd, section, debug) READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *); READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, PTR); READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, PTR); - READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, PTR); + + debug->fdr = NULL; return true; } @@ -1084,6 +1086,8 @@ mips_elf_get_extr (sym, esym) asymbol *sym; EXTR *esym; { + const struct ecoff_debug_swap *swap; + if (sym->flags & BSF_SECTION_SYM) return false; @@ -1103,7 +1107,11 @@ mips_elf_get_extr (sym, esym) return true; } - *esym = *((elf_symbol_type *) sym)->tc_data.mips_extr; + swap = (get_elf_backend_data (bfd_asymbol_bfd (sym)) + ->elf_backend_ecoff_debug_swap); + (*swap->swap_ext_in) (bfd_asymbol_bfd (sym), + ((elf_symbol_type *) sym)->tc_data.mips_extr, + esym); return true; } @@ -1140,6 +1148,7 @@ mips_elf_final_link (abfd, info) const struct ecoff_debug_swap *swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap; HDRR *symhdr = &debug.symbolic_header; + PTR mdebug_handle = NULL; abfd->outsymbols = (asymbol **) NULL; abfd->symcount = 0; @@ -1152,6 +1161,7 @@ mips_elf_final_link (abfd, info) return false; /* Accumulate the global symbols. */ + wginfo.info = info; wginfo.output_bfd = abfd; wginfo.psymalloc = &outsymalloc; _bfd_generic_link_hash_traverse (_bfd_generic_hash_table (info), @@ -1167,7 +1177,10 @@ mips_elf_final_link (abfd, info) secpp = &abfd->sections; while (*secpp != NULL) { - if ((*secpp)->_raw_size == 0 + if (((*secpp)->_raw_size == 0 + && strcmp ((*secpp)->name, ".data") != 0 + && strcmp ((*secpp)->name, ".text") != 0 + && strcmp ((*secpp)->name, ".bss") != 0) || strcmp ((*secpp)->name, ".options") == 0 || strncmp ((*secpp)->name, ".gptab", 6) == 0) { @@ -1182,6 +1195,8 @@ mips_elf_final_link (abfd, info) information. We don't write out the information until we have set the section sizes, because the ELF backend only assigns space in the file once. */ + reginfo_sec = NULL; + mdebug_sec = NULL; for (o = abfd->sections; o != (asection *) NULL; o = o->next) { if (strcmp (o->name, ".reginfo") == 0) @@ -1258,18 +1273,22 @@ mips_elf_final_link (abfd, info) /* We accumulate the debugging information itself in the debug_info structure. */ - debug.line = debug.line_end = NULL; - debug.external_dnr = debug.external_dnr_end = NULL; - debug.external_pdr = debug.external_pdr_end = NULL; - debug.external_sym = debug.external_sym_end = NULL; - debug.external_opt = debug.external_opt_end = NULL; - debug.external_aux = debug.external_aux_end = NULL; - debug.ss = debug.ss_end = NULL; + debug.line = NULL; + debug.external_dnr = NULL; + debug.external_pdr = NULL; + debug.external_sym = NULL; + debug.external_opt = NULL; + debug.external_aux = NULL; + debug.ss = NULL; debug.ssext = debug.ssext_end = NULL; - debug.external_fdr = debug.external_fdr_end = NULL; - debug.external_rfd = debug.external_rfd_end = NULL; + debug.external_fdr = NULL; + debug.external_rfd = NULL; debug.external_ext = debug.external_ext_end = NULL; + mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info); + if (mdebug_handle == (PTR) NULL) + return false; + for (p = o->link_order_head; p != (struct bfd_link_order *) NULL; p = p->next) @@ -1282,6 +1301,10 @@ mips_elf_final_link (abfd, info) if (p->type != bfd_indirect_link_order) continue; +#ifndef alloca + alloca (0); +#endif + input_section = p->u.indirect.section; input_bfd = input_section->owner; @@ -1308,9 +1331,8 @@ mips_elf_final_link (abfd, info) return false; if (! (bfd_ecoff_debug_accumulate - (abfd, &debug, swap, - input_bfd, &input_debug, input_swap, - info->relocateable))) + (mdebug_handle, abfd, &debug, swap, input_bfd, + &input_debug, input_swap, info))) return false; /* Loop through the external symbols. For each one with @@ -1355,15 +1377,21 @@ mips_elf_final_link (abfd, info) if (elf_sym->tc_data.mips_extr != NULL) continue; - elf_sym->tc_data.mips_extr = - (EXTR *) bfd_alloc (abfd, sizeof (EXTR)); + if (ext.ifd != -1) + { + BFD_ASSERT (ext.ifd + < input_debug.symbolic_header.ifdMax); + ext.ifd = input_debug.ifdmap[ext.ifd]; + } - ext.ifd += input_debug.ifdbase; - *elf_sym->tc_data.mips_extr = ext; + (*input_swap->swap_ext_out) (input_bfd, &ext, + (PTR) eraw_src); + elf_sym->tc_data.mips_extr = (PTR) eraw_src; } } - /* Free up the information we just read. */ + /* Free up the information we just read, except for the + external symbols which we may have pointers to. */ free (input_debug.line); free (input_debug.external_dnr); free (input_debug.external_pdr); @@ -1374,7 +1402,6 @@ mips_elf_final_link (abfd, info) free (input_debug.ssext); free (input_debug.external_fdr); free (input_debug.external_rfd); - free (input_debug.external_ext); } /* Build the external symbol information. */ @@ -1418,7 +1445,12 @@ mips_elf_final_link (abfd, info) input_bfd = input_section->owner; relsize = bfd_get_reloc_upper_bound (input_bfd, input_section); - relocs = (arelent **) bfd_xmalloc (relsize); + relocs = (arelent **) malloc (relsize); + if (!relocs) + { + bfd_error = no_memory; + return false; + } reloc_count = bfd_canonicalize_reloc (input_bfd, input_section, relocs, @@ -1434,6 +1466,11 @@ mips_elf_final_link (abfd, info) bfd_alloc (abfd, (o->reloc_count * sizeof (arelent *)))); + if (!o->orelocation) + { + bfd_error = no_memory; + return false; + } /* Reset the count so that it can be used as an index when putting in the output relocs. */ o->reloc_count = 0; @@ -1461,8 +1498,12 @@ mips_elf_final_link (abfd, info) (file_ptr) 0, (bfd_size_type) 0); BFD_ASSERT (abfd->output_has_begun); } - if (! bfd_ecoff_write_debug (abfd, &debug, swap, mdebug_sec->filepos)) + if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug, + swap, info, + mdebug_sec->filepos)) return false; + + bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info); } /* Handle all the link order information for the sections. */ -- cgit v1.1