From: Andrew Cagney <cagney@redhat.com>
Date: Thu, 6 Jul 2000 07:25:02 +0000 (+0000)
Subject: Always NULL terminate long option list.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=beb2de9b6154707bebd2fdd24d337a25ac8a638c;p=binutils-gdb.git

Always NULL terminate long option list.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c6eced5e472..588c6791762 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul  6 17:20:58 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* as.c (parse_args): NULL terminate the long option list.
+
 Tue Jul  4 14:08:28 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* config/tc-d30v.h: Include "write.h" for fixS.
diff --git a/gas/as.c b/gas/as.c
index f22120727ea..db218150356 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -425,13 +425,18 @@ parse_args (pargc, pargv)
     {"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL}
   };
 
-  /* Construct the option lists from the standard list and the
-     target dependent list.  */
+  /* Construct the option lists from the standard list and the target
+     dependent list.  Include space for an extra NULL option and
+     always NULL terminate. */
   shortopts = concat (std_shortopts, md_shortopts, (char *) NULL);
-  longopts = (struct option *) xmalloc (sizeof (std_longopts) + md_longopts_size);
+  longopts = (struct option *) xmalloc (sizeof (std_longopts)
+					+ md_longopts_size
+					+ sizeof (struct option));
   memcpy (longopts, std_longopts, sizeof (std_longopts));
   memcpy ((char *) longopts + sizeof (std_longopts),
 	  md_longopts, md_longopts_size);
+  memset ((char *) longopts + sizeof (std_longopts) + md_longopts_size,
+	  0, sizeof (struct option));
 
   /* Make a local copy of the old argv.  */
   old_argc = *pargc;