* Bug #15213, #18635: The use of the insecure m_scratch() and

[mmh] / sbr / getarguments.c

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index 1c61d9b..55fd06e 100644 (file)
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -3,14 +3,19 @@
  * getarguments.c -- Get the argument vector ready to go.
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 char **
 getarguments (char *invo_name, int argc, char **argv, int check_context)
 {
-    char *cp, **ap, **bp, **arguments;
+    char *cp = NULL, **ap = NULL, **bp = NULL, **arguments = NULL;
     int n = 0;
 
     /*
@@ -26,12 +31,11 @@ getarguments (char *invo_name, int argc, char **argv, int check_context)
            n++;
     }
 
-    if (!(arguments = (char **) malloc ((argc + n) * sizeof(*arguments))))
-       adios (NULL, "unable to malloc argument storage");
+    arguments = (char **) mh_xmalloc ((argc + n) * sizeof(*arguments));
     bp = arguments;
 
     /* Copy any arguments from profile/context */
-    if (n > 0) {
+    if (ap != NULL && n > 0) {
        while (*ap)
            *bp++ = *ap++;
      }