PR gas/684

	* read.c (s_incbin): Adjust default count for skip.  Check validity
	of count and skip rigorously.

1 files changed, 4 insertions, 4 deletions

diff --git a/gas/read.c b/gas/read.c
index e04e00c..daea0f9 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -5000,13 +5000,13 @@ s_incbin (int x ATTRIBUTE_UNUSED)
 	}
       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)
-	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);
 	  goto done;
 	}