diff options
| author | Alan Modra <amodra@gmail.com> | 2017-06-27 09:45:04 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2017-06-27 09:46:45 +0930 |
| commit | 7211ae501eb0de1044983f2dfb00091a58fbd66c (patch) | |
| tree | e795f62e3cab3e9a7c2935f6307f858163ec6f52 /bfd | |
| parent | dc819143fe1d44970a3da4b9ebc7828fa2337115 (diff) | |
| download | gdb-7211ae501eb0de1044983f2dfb00091a58fbd66c.zip gdb-7211ae501eb0de1044983f2dfb00091a58fbd66c.tar.gz gdb-7211ae501eb0de1044983f2dfb00091a58fbd66c.tar.bz2 | |
More fixes for bfd_get_section_contents change
PR binutils/21665
* libbfd.c (_bfd_generic_get_section_contents): Delete abort.
Use unsigned file pointer type, and remove cast.
* libbfd.c (_bfd_generic_get_section_contents_in_window): Likewise.
Add "count", not "sz".
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/libbfd.c | 18 |
2 files changed, 12 insertions, 14 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c2491d5..f440f8f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2017-06-27 Alan Modra <amodra@gmail.com> + + PR binutils/21665 + * libbfd.c (_bfd_generic_get_section_contents): Delete abort. + Use unsigned file pointer type, and remove cast. + * libbfd.c (_bfd_generic_get_section_contents_in_window): Likewise. + Add "count", not "sz". + 2017-06-26 Pedro Alves <palves@redhat.com> PR binutils/21665 diff --git a/bfd/libbfd.c b/bfd/libbfd.c index b8c65b5..0776451 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -789,7 +789,7 @@ _bfd_generic_get_section_contents (bfd *abfd, bfd_size_type count) { bfd_size_type sz; - file_ptr filesz; + ufile_ptr filesz; if (count == 0) return TRUE; @@ -813,14 +813,9 @@ _bfd_generic_get_section_contents (bfd *abfd, else sz = section->size; filesz = bfd_get_file_size (abfd); - if (filesz < 0) - { - /* This should never happen. */ - abort (); - } if (offset + count < count || offset + count > sz - || (section->filepos + offset + count) > (bfd_size_type) filesz) + || section->filepos + offset + count > filesz) { bfd_set_error (bfd_error_invalid_operation); return FALSE; @@ -843,7 +838,7 @@ _bfd_generic_get_section_contents_in_window { #ifdef USE_MMAP bfd_size_type sz; - file_ptr filesz; + ufile_ptr filesz; if (count == 0) return TRUE; @@ -877,13 +872,8 @@ _bfd_generic_get_section_contents_in_window else sz = section->size; filesz = bfd_get_file_size (abfd); - if (filesz < 0) - { - /* This should never happen. */ - abort (); - } if (offset + count > sz - || (section->filepos + offset + sz) > (bfd_size_type) filesz + || section->filepos + offset + count > filesz || ! bfd_get_file_window (abfd, section->filepos + offset, count, w, TRUE)) return FALSE; |