Commit: 42354845ae5e00ec1c3519e1f2166b79a9533401 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Révision: 42354845ae5e00ec1c3519e1f2166b79a9533401 (tree)
• l'heure: 2017-04-23 20:03:35
• Auteur: Alan Modra <amodra@gmai...>
• Commiter: Alan Modra

Message de Log

PR 21418, ar -N lacks arg check

PR 21418
* ar.c (main): Check -a, -b, -i and -N args are given.

Change Summary

• modified: binutils/ChangeLog
• modified: binutils/ar.c

Modification

--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,10 @@
 2017-04-23  Alan Modra  <[e-mail]>
 
+	PR 21418
+	* ar.c (main): Check -a, -b, -i and -N args are given.
+
[phone]  Alan Modra  <[e-mail]>
+
 	PR 21417
 	* ar.c (main): Check that an archive file is given after options.
 

--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -776,12 +776,18 @@ main (int argc, char **argv)
       default_deterministic ();
 
       if (postype != pos_default)
-	posname = argv[arg_index++];
+	{
+	  posname = argv[arg_index++];
+	  if (posname == NULL)
+	    fatal (_("missing position arg."));
+	}
 
       if (counted_name_mode)
 	{
 	  if (operation != extract && operation != del)
 	    fatal (_("`N' is only meaningful with the `x' and `d' options."));
+	  if (argv[arg_index] == NULL)
+	    fatal (_("`N' missing value."));
 	  counted_name_counter = atoi (argv[arg_index++]);
 	  if (counted_name_counter <= 0)
 	    fatal (_("Value for `N' must be positive."));