diff options
| author | Riku Voipio <riku.voipio@iki.fi> | 2015-10-15 12:56:55 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2015-10-15 12:56:55 +0100 |
| commit | b32a5c16f100c53fd9c0c22464f863eeeec6087a (patch) | |
| tree | 70940275d2f6dd1f453f6ffffc79769f8bdffe43 /bfd/elfcode.h | |
| parent | 35cd5fc22ec2e66936eeb9a13662d358ce0adff3 (diff) | |
| download | binutils-b32a5c16f100c53fd9c0c22464f863eeeec6087a.zip binutils-b32a5c16f100c53fd9c0c22464f863eeeec6087a.tar.gz binutils-b32a5c16f100c53fd9c0c22464f863eeeec6087a.tar.bz2 | |
Use the file_ptr type when calling bfd_seek.
PR ld/19123
* elfcore.h (elf_core_file_p): Use the file_ptr type to hold the
offset for bfd_seek.
* elfcode.h (elf_object_p): Likewise.
Diffstat (limited to 'bfd/elfcode.h')
| -rw-r--r-- | bfd/elfcode.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 7e309cf..26af1d1 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -605,13 +605,10 @@ elf_object_p (bfd *abfd) if (i_ehdrp->e_shoff != 0) { - bfd_signed_vma where = i_ehdrp->e_shoff; - - if (where != (file_ptr) where) - goto got_wrong_format_error; + file_ptr where = (file_ptr) i_ehdrp->e_shoff; /* Seek to the section header table in the file. */ - if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0) + if (bfd_seek (abfd, where, SEEK_SET) != 0) goto got_no_match; /* Read the first section header at index 0, and convert to internal @@ -657,19 +654,17 @@ elf_object_p (bfd *abfd) goto got_wrong_format_error; where += (i_ehdrp->e_shnum - 1) * sizeof (x_shdr); - if (where != (file_ptr) where) - goto got_wrong_format_error; if ((bfd_size_type) where <= i_ehdrp->e_shoff) goto got_wrong_format_error; - if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0) + if (bfd_seek (abfd, where, SEEK_SET) != 0) goto got_no_match; if (bfd_bread (&x_shdr, sizeof x_shdr, abfd) != sizeof (x_shdr)) goto got_no_match; /* Back to where we were. */ where = i_ehdrp->e_shoff + sizeof (x_shdr); - if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0) + if (bfd_seek (abfd, where, SEEK_SET) != 0) goto got_no_match; } } |