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

PR gas/684 

* read.c (s_incbin): Adjust default count for skip.  Check validity
	of count and skip rigorously.
This commit is contained in:
Alan Modra 2005-01-20 06:46:41 +00:00
parent d17d003345
commit c556cc9c6d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-20 Alan Modra <amodra@bigpond.net.au>
PR gas/684
* read.c (s_incbin): Adjust default count for skip. Check validity
of count and skip rigorously.
2005-01-19 Fred Fish <fnf@specifixinc.com> 2005-01-19 Fred Fish <fnf@specifixinc.com>
* config/tc-mips.c (dummy_opcode): Add init for new struct member. * config/tc-mips.c (dummy_opcode): Add init for new struct member.

8
gas/read.c
View File

@ -5000,13 +5000,13 @@ s_incbin (int x ATTRIBUTE_UNUSED)
} }
file_len = ftell (binfile); file_len = ftell (binfile);
/* If a count was not specified use the size of the file. */ /* If a count was not specified use the remainder of the file. */
if (count == 0) if (count == 0)
count = file_len; count = file_len - skip;
if (skip + count > file_len) if (skip < 0 || count < 0 || file_len < 0 || skip + count > file_len)
{ {
as_bad (_("skip (%ld) + count (%ld) larger than file size (%ld)"), as_bad (_("skip (%ld) or count (%ld) invalid for file size (%ld)"),
skip, count, file_len); skip, count, file_len);
goto done; goto done;
} }