diff options
| author | Alan Modra <amodra@gmail.com> | 2009-04-20 01:09:43 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2009-04-20 01:09:43 +0000 |
| commit | 383c383f84b11a0ee2acdc67b7d26751839be780 (patch) | |
| tree | a3b0d641b8844a03f170f99952883b293cdc8bda | |
| parent | 4483bce5a94e4c211b97cd3fdef4bbcc13b820fc (diff) | |
| download | gdb-383c383f84b11a0ee2acdc67b7d26751839be780.zip gdb-383c383f84b11a0ee2acdc67b7d26751839be780.tar.gz gdb-383c383f84b11a0ee2acdc67b7d26751839be780.tar.bz2 | |
2009-04-19 Peter O'Gorman <binutils@mlists.thewrittenword.com>
Alan Modra <amodra@bigpond.net.au>
Dave Korn <dave.korn.cygwin@gmail.com>
* peXXigen.c (_bfd_XXi_swap_sym_in): Fix name handling w.r.t
long names and non-NUL-terminated strings.
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/peXXigen.c | 34 |
2 files changed, 28 insertions, 13 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index dbf5275..984ab43 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2009-04-19 Peter O'Gorman <binutils@mlists.thewrittenword.com> + Alan Modra <amodra@bigpond.net.au> + Dave Korn <dave.korn.cygwin@gmail.com> + + * peXXigen.c (_bfd_XXi_swap_sym_in): Fix name handling w.r.t + long names and non-NUL-terminated strings. + 2009-04-17 H.J. Lu <hongjiu.lu@intel.com> * bfd-in2.h: Regenerated. diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index db6af64..fe712a6 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -129,6 +129,9 @@ _bfd_XXi_swap_sym_in (bfd * abfd, void * ext1, void * in1) they will be handled somewhat correctly in the bfd code. */ if (in->n_sclass == C_SECTION) { + char namebuf[SYMNMLEN + 1]; + const char *name; + in->n_value = 0x0; /* Create synthetic empty sections as needed. DJ */ @@ -136,33 +139,38 @@ _bfd_XXi_swap_sym_in (bfd * abfd, void * ext1, void * in1) { asection *sec; - for (sec = abfd->sections; sec; sec = sec->next) - { - if (strcmp (sec->name, in->n_name) == 0) - { - in->n_scnum = sec->target_index; - break; - } - } + name = _bfd_coff_internal_syment_name (abfd, in, namebuf); + if (name == NULL) + /* FIXME: Return error. */ + abort (); + sec = bfd_get_section_by_name (abfd, name); + if (sec != NULL) + in->n_scnum = sec->target_index; } if (in->n_scnum == 0) { int unused_section_number = 0; asection *sec; - char *name; flagword flags; for (sec = abfd->sections; sec; sec = sec->next) if (unused_section_number <= sec->target_index) unused_section_number = sec->target_index + 1; - name = bfd_alloc (abfd, (bfd_size_type) strlen (in->n_name) + 10); - if (name == NULL) - return; - strcpy (name, in->n_name); + if (name == namebuf) + { + name = bfd_alloc (abfd, strlen (namebuf) + 1); + if (name == NULL) + /* FIXME: Return error. */ + abort (); + strcpy ((char *) name, namebuf); + } flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_DATA | SEC_LOAD; sec = bfd_make_section_anyway_with_flags (abfd, name, flags); + if (sec == NULL) + /* FIXME: Return error. */ + abort (); sec->vma = 0; sec->lma = 0; |