X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2..9322ba2854211794c27fae9468768b80b767c211:/sbr/getarguments.c

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index fc3d2c05..e1b86388 100644
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -15,14 +13,14 @@
 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 */
@@ -35,7 +33,7 @@ getarguments (char *invo_name, int argc, char **argv, int check_context)
     bp = arguments;
 
     /* Copy any arguments from profile/context */
-    if (n > 0) {
+    if (ap != NULL && n > 0) {
 	while (*ap)
 	    *bp++ = *ap++;
      }