From: Bhushan Attarde Date: Wed, 14 Sep 2016 12:49:16 +0000 (+0100) Subject: Prevent segfault in GDB when searching for architecture matches. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d9bbb73c1df68741048c3d0f837b50c289ea608;p=binutils-gdb.git Prevent segfault in GDB when searching for architecture matches. * format.c (struct bfd_preserve): New "build_id" field. (bfd_preserve_save): Save "build_id". (bfd_preserve_restore): Restore "build_id". --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6863e3afef7..7414c39f376 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-09-14 Bhushan Attarde + + * format.c (struct bfd_preserve): New "build_id" field. + (bfd_preserve_save): Save "build_id". + (bfd_preserve_restore): Restore "build_id". + 2016-09-06 H.J. Lu PR ld/20550 diff --git a/bfd/format.c b/bfd/format.c index f34b1d48427..15237a3b176 100644 --- a/bfd/format.c +++ b/bfd/format.c @@ -104,6 +104,7 @@ struct bfd_preserve struct bfd_section *section_last; unsigned int section_count; struct bfd_hash_table section_htab; + const struct bfd_build_id *build_id; }; /* When testing an object for compatibility with a particular target @@ -126,6 +127,7 @@ bfd_preserve_save (bfd *abfd, struct bfd_preserve *preserve) preserve->section_count = abfd->section_count; preserve->section_htab = abfd->section_htab; preserve->marker = bfd_alloc (abfd, 1); + preserve->build_id = abfd->build_id; if (preserve->marker == NULL) return FALSE; @@ -158,6 +160,7 @@ bfd_preserve_restore (bfd *abfd, struct bfd_preserve *preserve) abfd->sections = preserve->sections; abfd->section_last = preserve->section_last; abfd->section_count = preserve->section_count; + abfd->build_id = preserve->build_id; /* bfd_release frees all memory more recently bfd_alloc'd than its arg, as well as its arg. */