diff options
| author | Zack Weinberg <zackw@panix.com> | 2004-05-07 00:01:25 +0000 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2004-05-07 00:01:25 +0000 |
| commit | eb61d2d606dacb82c4447dd45c78e4e04f77206e (patch) | |
| tree | 020d70d499d59fb5e32bd79ffef04a9956d83db5 | |
| parent | 00ed60a15b827d61b55d8159628ef76d0e6dba43 (diff) | |
| download | fsf-binutils-gdb-eb61d2d606dacb82c4447dd45c78e4e04f77206e.zip fsf-binutils-gdb-eb61d2d606dacb82c4447dd45c78e4e04f77206e.tar.gz fsf-binutils-gdb-eb61d2d606dacb82c4447dd45c78e4e04f77206e.tar.bz2 | |
* dwarf2.c (add_line_info): Also set info->filename to NULL if
filename argument is null; do not call strlen on a null pointer.
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/dwarf2.c | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4282915..26745e2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2004-05-06 Zack Weinberg <zack@codesourcery.com> + + * dwarf2.c (add_line_info): Also set info->filename to NULL if + filename argument is null; do not call strlen on a null pointer. + 2004-05-06 Daniel Jacobowitz <drow@mvista.com> * elf32-arm.h (elf32_arm_relocate_section): Remove R_ARM_PLT32 @@ -301,7 +306,7 @@ 2004-04-22 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> - * hpux-core.c (hpux_core_core_file_p): Add cast in call to + * hpux-core.c (hpux_core_core_file_p): Add cast in call to make_bfd_asection. * som.c (som_set_section_contents): Constantify second argument. (hppa_som_gen_reloc_type): Abort for unsupported selectors. @@ -558,7 +563,7 @@ * stabs.c (_bfd_link_section_stabs): Do not skip N_EXCL stabs. 2004-03-30 Galit Heller <Galit.Heller@nsc.com> - Tomer Levi <Tomer.Levi@nsc.com> + Tomer Levi <Tomer.Levi@nsc.com> * Makefile.am (ALL_MACHINES): Add cpu-cr16c.lo. (ALL_MACHINES_CFILES): Add cpu-cr16c.c. diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index ceb28af..6182ea9 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -801,10 +801,9 @@ add_line_info (struct line_info_table *table, info->column = column; info->end_sequence = end_sequence; - amt = strlen (filename); - if (amt) + if (filename && filename[0]) { - info->filename = bfd_alloc (table->abfd, amt + 1); + info->filename = bfd_alloc (table->abfd, strlen (filename) + 1); if (info->filename) strcpy (info->filename, filename); } |