diff options
| author | Nick Clifton <nickc@redhat.com> | 2021-04-21 11:09:11 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2021-04-21 11:09:11 +0100 |
| commit | 33fe00c1232fa22c6c5f0099c1268a707f64b786 (patch) | |
| tree | 6c1979ab149f03cf47c1a267e9dcdd5740658c1c | |
| parent | 23356397449a8aa65afead0a895a20be53b3c6b0 (diff) | |
| download | fsf-binutils-gdb-33fe00c1232fa22c6c5f0099c1268a707f64b786.zip fsf-binutils-gdb-33fe00c1232fa22c6c5f0099c1268a707f64b786.tar.gz fsf-binutils-gdb-33fe00c1232fa22c6c5f0099c1268a707f64b786.tar.bz2 | |
Fix an assertion failure in the BFD library when parsing a corrupt SREC format file.
PR 27759
* srec.c (srec_read_section): Replace assertions with error
returns.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/srec.c | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 972311b..85f4f37 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2021-04-21 Nick Clifton <nickc@redhat.com> + + PR 27759 + * srec.c (srec_read_section): Replace assertions with error + returns. + 2021-04-20 Clément Chigot <clement.chigot@atos.net> PR binutils/21700 @@ -733,7 +733,8 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) /* This is called after srec_scan has already been called, so we ought to know the exact format. */ - BFD_ASSERT (c == 'S'); + if (c != 'S') + goto error_return; if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3) goto error_return; @@ -759,7 +760,8 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) switch (hdr[0]) { default: - BFD_ASSERT (sofar == section->size); + if (sofar != section->size) + goto error_return; free (buf); return true; @@ -783,7 +785,8 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) if (address != section->vma + sofar) { /* We've come to the end of this section. */ - BFD_ASSERT (sofar == section->size); + if (sofar != section->size) + goto error_return; free (buf); return true; } @@ -805,7 +808,8 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) if (error) goto error_return; - BFD_ASSERT (sofar == section->size); + if (sofar != section->size) + goto error_return; free (buf); return true; |