OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Report an error for S-records with less than the miniumum size 

* srec.c (srec_scan): Revert last change.  Report an error for
	S-records with less than the miniumum byte count.
This commit is contained in:
Alan Modra 2014-08-29 10:36:29 +09:30
parent 5a1431e66e
commit bd25671c6f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2014-08-29 Alan Modra <amodra@gmail.com>
* srec.c (srec_scan): Revert last change. Report an error for
S-records with less than the miniumum byte count.
2014-08-28 H.J. Lu <hongjiu.lu@intel.com>
* srec.c (srec_scan): Return error for 0 size.

18
bfd/srec.c
View File

@ -453,7 +453,7 @@ srec_scan (bfd *abfd)
{
file_ptr pos;
char hdr[3];
unsigned int bytes;
unsigned int bytes, min_bytes;
bfd_vma address;
bfd_byte *data;
unsigned char check_sum;
@ -476,6 +476,19 @@ srec_scan (bfd *abfd)
}
check_sum = bytes = HEX (hdr + 1);
min_bytes = 3;
if (hdr[0] == '2' || hdr[0] == '8')
min_bytes = 4;
else if (hdr[0] == '3' || hdr[0] == '7')
min_bytes = 5;
if (bytes < min_bytes)
{
(*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"),
abfd, lineno, bytes);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
if (bytes * 2 > bufsize)
{
if (buf != NULL)
@ -486,8 +499,7 @@ srec_scan (bfd *abfd)
bufsize = bytes * 2;
}
if (bytes == 0
|| bfd_bread (buf, (bfd_size_type) bytes * 2, abfd) != bytes * 2)
if (bfd_bread (buf, (bfd_size_type) bytes * 2, abfd) != bytes * 2)
goto error_return;
/* Ignore the checksum byte. */