diff options
| author |   art <art@openbsd.org> | 2000-09-26 14:01:38 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2000-09-26 14:01:38 +0000 |
| commit | 176819c200cf9b5be766860be9ccbd9581448673 (patch) | |
| tree | 6be74958cc76a9b8e1e47aaf81d8abb0db871b15 /sys/kern/exec_script.c | |
| parent | fix minor typo (diff) | |
| download | wireguard-openbsd-176819c200cf9b5be766860be9ccbd9581448673.tar.xz wireguard-openbsd-176819c200cf9b5be766860be9ccbd9581448673.zip | |
Don't use MALLOC/FREE on variable sized allocations.
Diffstat (limited to 'sys/kern/exec_script.c')
| -rw-r--r-- | sys/kern/exec_script.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c index 5dd95822722..860ad936ffc 100644 --- a/sys/kern/exec_script.c +++ b/sys/kern/exec_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_script.c,v 1.10 2000/02/01 04:03:14 assar Exp $ */ +/* $OpenBSD: exec_script.c,v 1.11 2000/09/26 14:01:38 art Exp $ */ /* $NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $ */ /* @@ -191,13 +191,13 @@ check_shell: /* and set up the fake args list, for later */ MALLOC(shellargp, char **, 4 * sizeof(char *), M_EXEC, M_WAITOK); tmpsap = shellargp; - MALLOC(*tmpsap, char *, shellnamelen + 1, M_EXEC, M_WAITOK); + *tmpsap = malloc(shellnamelen + 1, M_EXEC, M_WAITOK); strcpy(*tmpsap++, shellname); if (shellarg != NULL) { - MALLOC(*tmpsap, char *, shellarglen + 1, M_EXEC, M_WAITOK); + *tmpsap = malloc(shellarglen + 1, M_EXEC, M_WAITOK); strcpy(*tmpsap++, shellarg); } - MALLOC(*tmpsap, char *, MAXPATHLEN, M_EXEC, M_WAITOK); + *tmpsap = malloc(MAXPATHLEN, M_EXEC, M_WAITOK); #ifdef FDSCRIPTS if ((epp->ep_flags & EXEC_HASFD) == 0) { #endif @@ -281,7 +281,7 @@ fail: /* free the fake arg list, because we're not returning it */ tmpsap = shellargp; while (*tmpsap != NULL) { - FREE(*tmpsap, M_EXEC); + free(*tmpsap, M_EXEC); tmpsap++; } FREE(shellargp, M_EXEC); |