diff options
| author | Tristan Gingold <gingold@adacore.com> | 2010-06-09 13:28:31 +0000 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2010-06-09 13:28:31 +0000 |
| commit | f0b3dbfc47e96c4c0dfabb010e34923dedfaae87 (patch) | |
| tree | 8e04717f1016357e117b887f15d55a1f1e009deb /bfd | |
| parent | 5ddb52faff9c516e96892f44e9e5b47d8b19e0bb (diff) | |
| download | fsf-binutils-gdb-f0b3dbfc47e96c4c0dfabb010e34923dedfaae87.zip fsf-binutils-gdb-f0b3dbfc47e96c4c0dfabb010e34923dedfaae87.tar.gz fsf-binutils-gdb-f0b3dbfc47e96c4c0dfabb010e34923dedfaae87.tar.bz2 | |
2010-06-09 Tristan Gingold <gingold@adacore.com>
* bfdio.c (bfd_bread): Fix the code to prevent reading past the
end of archive members.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/bfdio.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6c4e8ca..ea74ef9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-06-09 Tristan Gingold <gingold@adacore.com> + + * bfdio.c (bfd_bread): Fix the code to prevent reading past the + end of archive members. + 2010-06-08 Tristan Gingold <gingold@adacore.com> * som.c (som_bfd_free_cached_info): Do not free relocations as diff --git a/bfd/bfdio.c b/bfd/bfdio.c index 4c13a76..ce92781 100644 --- a/bfd/bfdio.c +++ b/bfd/bfdio.c @@ -180,8 +180,12 @@ bfd_bread (void *ptr, bfd_size_type size, bfd *abfd) if (abfd->arelt_data != NULL) { size_t maxbytes = ((struct areltdata *) abfd->arelt_data)->parsed_size; - if (size > maxbytes) - size = maxbytes; + if (abfd->where + size > maxbytes) + { + if (abfd->where >= maxbytes) + return 0; + size = maxbytes - abfd->where; + } } if (abfd->iovec) |