diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2006-05-04 16:24:34 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2006-05-04 16:24:34 +1000 |
| commit | d8093e49bf06813a8c97cbc90810f4863388af77 (patch) | |
| tree | 186c431180b5e63c14733c5d92a5cdb988426fca /openbsd-compat/setproctitle.c | |
| parent | 596d33801f6d703c1e45c74df6f6d6fe7ee085bb (diff) | |
- (dtucker) [auth-pam.c groupaccess.c monitor.c monitor_wrap.c scard-opensc.c
session.c ssh-rand-helper.c sshd.c openbsd-compat/bsd-cygwin_util.c
openbsd-compat/setproctitle.c] Convert malloc(foo*bar) -> calloc(foo,bar)
in Portable-only code; since calloc zeros, remove now-redundant memsets.
Also add a couple of sanity checks. With & ok djm@
Diffstat (limited to 'openbsd-compat/setproctitle.c')
| -rw-r--r-- | openbsd-compat/setproctitle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c index 6e2b19bb..95b662e4 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c @@ -80,7 +80,7 @@ compat_init_setproctitle(int argc, char *argv[]) /* Fail if we can't allocate room for the new environment */ for (i = 0; envp[i] != NULL; i++) ; - if ((environ = malloc(sizeof(*environ) * (i + 1))) == NULL) { + if ((environ = calloc(i + 1, sizeof(*environ))) == NULL) { environ = envp; /* put it back */ return; } |