diff options
-rw-r--r-- | bfd/ChangeLog | 4 | ||||
-rw-r--r-- | bfd/tekhex.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index bd43b67..b344133 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2020-03-31 Alan Modra <amodra@gmail.com> + + * tekhex.c (pass_over): Check is_eof before reading buffer. + 2020-03-30 Nick Clifton <nickc@redhat.com> PR binutils/pr25662 diff --git a/bfd/tekhex.c b/bfd/tekhex.c index c2834b3..0001457 100644 --- a/bfd/tekhex.c +++ b/bfd/tekhex.c @@ -525,7 +525,7 @@ pass_over (bfd *abfd, bfd_boolean (*func) (bfd *, int, char *, char *)) /* Find first '%'. */ is_eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1); - while (*src != '%' && !is_eof) + while (!is_eof && *src != '%') is_eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1); if (is_eof) |