Fix invalid pointer arithmetic.

[nmh] / sbr / getarguments.c

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index 1c61d9bb4e10830d69d40ed7f94f3f60de26b0ba..28cbe465e308ee825da8dc8e4c30f9c492b1b958 100644 (file)
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -1,23 +1,24 @@
-
-/*
- * getarguments.c -- Get the argument vector ready to go.
+/* 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;
 
     /*
      * Check if profile/context specifies any arguments
      */
     if (check_context && (cp = context_find (invo_name))) {
-       cp = getcpy (cp);               /* make copy    */
+       cp = mh_xstrdup(cp);            /* make copy    */
        ap = brkstring (cp, " ", "\n"); /* split string */
 
        /* Count number of arguments split */
@@ -26,12 +27,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 = 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++;
      }