diff options
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/bfdio.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 90274890ea9..2da474e02c9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2020-05-23 Alan Modra <amodra@gmail.com> + + * bfdio.c (bfd_get_file_size): Don't segfault on NULL arch_header. + 2020-05-22 Alan Modra <amodra@gmail.com> PR 25882 diff --git a/bfd/bfdio.c b/bfd/bfdio.c index 5ef3ec493ea..5f144bc7f3f 100644 --- a/bfd/bfdio.c +++ b/bfd/bfdio.c @@ -495,8 +495,9 @@ bfd_get_file_size (bfd *abfd) struct areltdata *adata = (struct areltdata *) abfd->arelt_data; archive_size = adata->parsed_size; /* If the archive is compressed we can't compare against file size. */ - if (memcmp (((struct ar_hdr *) adata->arch_header)->ar_fmag, - "Z\012", 2) == 0) + if (adata->arch_header != NULL + && memcmp (((struct ar_hdr *) adata->arch_header)->ar_fmag, + "Z\012", 2) == 0) return archive_size; abfd = abfd->my_archive; } |