* elfcode.h (elf_object_p): Preserve and clear abfd section

information.  Restore at error.
This commit is contained in:
Hans-Peter Nilsson 2000-09-27 07:52:24 +00:00
parent 3028b4c011
commit a17cc40f09
2 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2000-09-26 Hans-Peter Nilsson <hp@axis.com>
* elfcode.h (elf_object_p): Preserve and clear abfd section
information. Restore at error.
2000-09-26 Paul Sokolovsky <Paul.Sokolovsky@technologist.com>
* peigen.c (_bfd_pei_swap_aouthdr_in): If some DataDirectory

View File

@ -500,9 +500,16 @@ elf_object_p (abfd)
char *shstrtab; /* Internal copy of section header stringtab */
struct elf_backend_data *ebd;
struct elf_obj_tdata *preserved_tdata = elf_tdata (abfd);
struct sec *preserved_sections = abfd->sections;
unsigned int preserved_section_count = abfd->section_count;
struct elf_obj_tdata *new_tdata = NULL;
asection *s;
/* Clear section information, since there might be a recognized bfd that
we now check if we can replace, and we don't want to append to it. */
abfd->sections = NULL;
abfd->section_count = 0;
/* Read in the ELF header in external format. */
if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
@ -745,6 +752,8 @@ elf_object_p (abfd)
if (new_tdata != NULL)
bfd_release (abfd, new_tdata);
elf_tdata (abfd) = preserved_tdata;
abfd->sections = preserved_sections;
abfd->section_count = preserved_section_count;
return (NULL);
}