mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-26 13:56:22 +08:00
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.
This commit is contained in:
David MacKenzie
118
bfd/nlmcode.h
118
bfd/nlmcode.h
@ -111,14 +111,11 @@ DEFUN (nlm_object_p, (abfd), bfd * abfd)
|
||||
|
||||
/* Read in the fixed length portion of the NLM header in external format. */
|
||||
|
||||
x_fxdhdr = alloca (nlm_fixed_header_size (abfd));
|
||||
x_fxdhdr = (PTR) alloca (nlm_fixed_header_size (abfd));
|
||||
|
||||
if (bfd_read ((PTR) x_fxdhdr, nlm_fixed_header_size (abfd), 1, abfd) !=
|
||||
nlm_fixed_header_size (abfd))
|
||||
{
|
||||
bfd_error = system_call_error;
|
||||
goto got_no_match;
|
||||
}
|
||||
goto got_wrong_format_error;
|
||||
|
||||
/* Allocate an instance of the nlm_obj_tdata structure and hook it up to
|
||||
the tdata pointer in the bfd. */
|
||||
@ -561,7 +558,7 @@ DEFUN (nlm_swap_auxiliary_headers_in, (abfd),
|
||||
}
|
||||
else if (strncmp (tempstr, "CoPyRiGhT=", 10) == 0)
|
||||
{
|
||||
if (bfd_read ((PTR) &nlm_copyright_header (abfd)->stamp,
|
||||
if (bfd_read ((PTR) nlm_copyright_header (abfd)->stamp,
|
||||
sizeof (nlm_copyright_header (abfd)->stamp),
|
||||
1, abfd)
|
||||
!= sizeof (nlm_copyright_header (abfd)->stamp))
|
||||
@ -859,7 +856,8 @@ nlm_make_empty_symbol (abfd)
|
||||
nlm_symbol_type *new;
|
||||
|
||||
new = (nlm_symbol_type *) bfd_zalloc (abfd, sizeof (nlm_symbol_type));
|
||||
new->symbol.the_bfd = abfd;
|
||||
if (new)
|
||||
new->symbol.the_bfd = abfd;
|
||||
return &new->symbol;
|
||||
}
|
||||
|
||||
@ -964,6 +962,11 @@ nlm_slurp_symbol_table (abfd)
|
||||
|
||||
sym = ((nlm_symbol_type *)
|
||||
bfd_zalloc (abfd, totsymcount * sizeof (nlm_symbol_type)));
|
||||
if (!sym)
|
||||
{
|
||||
bfd_error = no_memory;
|
||||
return false;
|
||||
}
|
||||
nlm_set_symbols (abfd, sym);
|
||||
|
||||
/* We use the bfd's symcount directly as the control count, so that early
|
||||
@ -982,6 +985,11 @@ nlm_slurp_symbol_table (abfd)
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -1048,6 +1056,11 @@ nlm_slurp_symbol_table (abfd)
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -1399,6 +1412,15 @@ nlm_compute_section_file_positions (abfd)
|
||||
nlm_set_text_low (abfd, text_low);
|
||||
nlm_set_data_low (abfd, data_low);
|
||||
|
||||
if (nlm_no_uninitialized_data (abfd))
|
||||
{
|
||||
/* This NetWare format does not use uninitialized data. We must
|
||||
increase the size of the data section. We will never wind up
|
||||
writing those file locations, so they will remain zero. */
|
||||
data += bss;
|
||||
bss = 0;
|
||||
}
|
||||
|
||||
text_ptr = BFD_ALIGN (sofar, 1 << text_align);
|
||||
data_ptr = BFD_ALIGN (text_ptr + text, 1 << data_align);
|
||||
other_ptr = BFD_ALIGN (data_ptr + data, 1 << other_align);
|
||||
@ -1465,8 +1487,17 @@ nlm_compute_section_file_positions (abfd)
|
||||
add += size;
|
||||
add = BFD_ALIGN (add, 1 << bss_sec->alignment_power);
|
||||
}
|
||||
nlm_fixed_header (abfd)->uninitializedDataSize += add;
|
||||
bss_sec->_raw_size += add;
|
||||
if (add != 0)
|
||||
{
|
||||
if (nlm_no_uninitialized_data (abfd))
|
||||
{
|
||||
/* We could handle this case, but so far it hasn't been
|
||||
necessary. */
|
||||
abort ();
|
||||
}
|
||||
nlm_fixed_header (abfd)->uninitializedDataSize += add;
|
||||
bss_sec->_raw_size += add;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
@ -1530,9 +1561,17 @@ nlm_external_reloc_compare (p1, p2)
|
||||
{
|
||||
const struct reloc_and_sec *r1 = (const struct reloc_and_sec *) p1;
|
||||
const struct reloc_and_sec *r2 = (const struct reloc_and_sec *) p2;
|
||||
int cmp;
|
||||
|
||||
return strcmp ((*r1->rel->sym_ptr_ptr)->name,
|
||||
(*r2->rel->sym_ptr_ptr)->name);
|
||||
cmp = strcmp ((*r1->rel->sym_ptr_ptr)->name,
|
||||
(*r2->rel->sym_ptr_ptr)->name);
|
||||
if (cmp != 0)
|
||||
return cmp;
|
||||
|
||||
/* We sort by address within symbol to make the sort more stable and
|
||||
increase the chances that different hosts will generate bit for
|
||||
bit equivalent results. */
|
||||
return (int) (r1->rel->address - r2->rel->address);
|
||||
}
|
||||
|
||||
/* Write out an NLM file. We write out the information in this order:
|
||||
@ -1574,7 +1613,7 @@ nlm_write_object_contents (abfd)
|
||||
asymbol **sym_ptr_ptr;
|
||||
file_ptr last;
|
||||
boolean (*write_prefix_func) PARAMS ((bfd *));
|
||||
unsigned char *fixed_header = alloca (nlm_fixed_header_size (abfd));
|
||||
unsigned char *fixed_header = (unsigned char *) alloca (nlm_fixed_header_size (abfd));
|
||||
|
||||
if (abfd->output_has_begun == false
|
||||
&& nlm_compute_section_file_positions (abfd) == false)
|
||||
@ -1705,7 +1744,7 @@ nlm_write_object_contents (abfd)
|
||||
BFD_ASSERT (i == external_reloc_count);
|
||||
|
||||
/* Sort the external relocs by name. */
|
||||
qsort (external_relocs, external_reloc_count,
|
||||
qsort ((PTR) external_relocs, (size_t) external_reloc_count,
|
||||
sizeof (struct reloc_and_sec), nlm_external_reloc_compare);
|
||||
|
||||
/* Write out the external relocs. */
|
||||
@ -1745,10 +1784,13 @@ nlm_write_object_contents (abfd)
|
||||
if (sym_ptr_ptr != (asymbol **) NULL)
|
||||
{
|
||||
bfd_vma (*get_public_offset_func) PARAMS ((bfd *, asymbol *));
|
||||
boolean (*write_export_func) PARAMS ((bfd*, asymbol *, bfd_vma));
|
||||
|
||||
asymbol **sym_end;
|
||||
|
||||
nlm_fixed_header (abfd)->publicsOffset = bfd_tell (abfd);
|
||||
get_public_offset_func = nlm_get_public_offset_func (abfd);
|
||||
write_export_func = nlm_write_export_func (abfd);
|
||||
c = 0;
|
||||
sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
|
||||
for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
|
||||
@ -1766,15 +1808,6 @@ nlm_write_object_contents (abfd)
|
||||
|
||||
++c;
|
||||
|
||||
len = strlen (sym->name);
|
||||
if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd)
|
||||
!= sizeof (bfd_byte))
|
||||
|| bfd_write (sym->name, len, 1, abfd) != len)
|
||||
{
|
||||
bfd_error = system_call_error;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (get_public_offset_func)
|
||||
{
|
||||
/* Most backends can use the code below, but
|
||||
@ -1804,13 +1837,30 @@ nlm_write_object_contents (abfd)
|
||||
}
|
||||
}
|
||||
|
||||
put_word (abfd, offset, temp);
|
||||
if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
|
||||
if (write_export_func)
|
||||
{
|
||||
bfd_error = system_call_error;
|
||||
return false;
|
||||
if ((*write_export_func) (abfd, sym, offset) == false)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
len = strlen (sym->name);
|
||||
if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd)
|
||||
!= sizeof (bfd_byte))
|
||||
|| bfd_write (sym->name, len, 1, abfd) != len)
|
||||
{
|
||||
bfd_error = system_call_error;
|
||||
return false;
|
||||
}
|
||||
|
||||
put_word (abfd, offset, temp);
|
||||
if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
|
||||
{
|
||||
bfd_error = system_call_error;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
nlm_fixed_header (abfd)->numberOfPublics = c;
|
||||
|
||||
/* Write out the debugging records. The NLM conversion program
|
||||
@ -1849,16 +1899,18 @@ nlm_write_object_contents (abfd)
|
||||
|
||||
++c;
|
||||
|
||||
offset = sym->value;
|
||||
offset = bfd_asymbol_value (sym);
|
||||
sec = sym->section;
|
||||
if (sec->flags & SEC_CODE)
|
||||
type = 1;
|
||||
else if (sec->flags & SEC_DATA)
|
||||
type = 0;
|
||||
else if (sec->flags & SEC_ALLOC)
|
||||
{
|
||||
offset -= nlm_get_text_low (abfd);
|
||||
type = 1;
|
||||
}
|
||||
else if (sec->flags & (SEC_DATA | SEC_ALLOC))
|
||||
{
|
||||
/* SEC_ALLOC is for the .bss section. */
|
||||
offset -= nlm_get_data_low (abfd);
|
||||
type = 0;
|
||||
offset += nlm_fixed_header (abfd)->dataImageSize;
|
||||
}
|
||||
else
|
||||
type = 2;
|
||||
|
||||
Reference in New Issue
Block a user