mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-30 12:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix an assertion failure in the BFD library when parsing a corrupt SREC format file.

Browse Source 
PR 27759
	* srec.c (srec_read_section): Replace assertions with error
	returns.
This commit is contained in:
Nick Clifton 2021-04-21 11:09:11 +01:00
parent 2335639744
commit 33fe00c123
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -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

12
bfd/srec.c
View File

@ -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;