[src/trunk]: src/usr.sbin/mailwrapper Add forgottern addarg(&al, NULL, 0) bef...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d73cd04d486
branches:  trunk
changeset: 499298:5d73cd04d486
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Nov 16 08:33:33 2000 +0000

description:
Add forgottern addarg(&al, NULL, 0) before execve() to prevent coredump.

diffstat:

 usr.sbin/mailwrapper/mailwrapper.c |  20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diffs (52 lines):

diff -r 5d6829732b41 -r 5d73cd04d486 usr.sbin/mailwrapper/mailwrapper.c
--- a/usr.sbin/mailwrapper/mailwrapper.c        Thu Nov 16 08:07:55 2000 +0000
+++ b/usr.sbin/mailwrapper/mailwrapper.c        Thu Nov 16 08:33:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mailwrapper.c,v 1.3 1999/05/29 18:18:15 christos Exp $ */
+/*     $NetBSD: mailwrapper.c,v 1.4 2000/11/16 08:33:33 msaitoh Exp $  */
 
 /*
  * Copyright (c) 1998
@@ -49,7 +49,6 @@
 
 static void initarg __P((struct arglist *));
 static void addarg __P((struct arglist *, const char *, int));
-static void freearg __P((struct arglist *, int));
 
 extern const char *__progname; /* from crt0.o */
 
@@ -82,18 +81,6 @@
                al->argv[al->argc++] = (char *)arg;
 }
 
-static void
-freearg(al, copy)
-       struct arglist *al;
-       int copy;
-{
-       size_t i;
-       if (copy)
-               for (i = 0; i < al->argc; i++)
-                       free(al->argv[i]);
-       free(al->argv);
-}
-
 int
 main(argc, argv, envp)
        int argc;
@@ -151,14 +138,11 @@
 
        (void)fclose(config);
 
+       addarg(&al, NULL, 0);
        execve(to, al.argv, envp);
-       freearg(&al, 0);
-       free(line);
        err(1, "mailwrapper: execing %s", to);
        /*NOTREACHED*/
 parse_error:
-       freearg(&al, 0);
-       free(line);
        errx(1, "mailwrapper: parse error in %s at line %lu",
            _PATH_MAILERCONF, (u_long)lineno);
        /*NOTREACHED*/