Fix out-of-bounds error when incorporating email from stdin

[mmh] / sbr / getarguments.c

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index 5dbdf56..e8da984 100644 (file)
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -10,7 +10,7 @@
 #include <h/utils.h>
 
 char **
-getarguments (char *invo_name, int argc, char **argv, int check_context)
+getarguments(char *invo_name, int argc, char **argv, int check_context)
 {
        char *cp = NULL, **ap = NULL, **bp = NULL, **arguments = NULL;
        int n = 0;
@@ -18,9 +18,9 @@ getarguments (char *invo_name, int argc, char **argv, int check_context)
        /*
        ** Check if profile/context specifies any arguments
        */
-       if (check_context && (cp = context_find (invo_name))) {
-               cp = getcpy (cp);  /* make copy */
-               ap = brkstring (cp, " ", "\n");  /* split string */
+       if (check_context && (cp = context_find(invo_name))) {
+               cp = mh_xstrdup(cp);  /* make copy */
+               ap = brkstring(cp, " ", "\n");  /* split string */
 
                /* Count number of arguments split */
                bp = ap;
@@ -28,14 +28,14 @@ getarguments (char *invo_name, int argc, char **argv, int check_context)
                        n++;
        }
 
-       arguments = (char **) mh_xmalloc ((argc + n) * sizeof(*arguments));
+       arguments = mh_xcalloc(argc + n, sizeof(*arguments));
        bp = arguments;
 
        /* Copy any arguments from profile/context */
        if (ap != NULL && n > 0) {
                while (*ap)
                        *bp++ = *ap++;
-        }
+       }
 
        /* Copy arguments from command line */
        argv++;