diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-05-20 15:20:08 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-05-20 15:20:08 +1000 |
commit | 29171e9f5c094d912bd27c60b2973617e05cc785 (patch) | |
tree | e22d06c2e77bc494af8614871c6f87cd9a3ed50e /auth-pam.c | |
parent | f520ea156782619321d4d5ac2389130615b7eea3 (diff) |
- (dtucker) [auth-pam.c] malloc+memset -> calloc. Patch from
ldv at altlinux.org.
Diffstat (limited to 'auth-pam.c')
-rw-r--r-- | auth-pam.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/auth-pam.c b/auth-pam.c index c08d47229..bfd8f3270 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -686,8 +686,7 @@ sshpam_init_ctx(Authctxt *authctxt) | |||
686 | return (NULL); | 686 | return (NULL); |
687 | } | 687 | } |
688 | 688 | ||
689 | ctxt = xmalloc(sizeof *ctxt); | 689 | ctxt = xcalloc(1, sizeof *ctxt); |
690 | memset(ctxt, 0, sizeof(*ctxt)); | ||
691 | 690 | ||
692 | /* Start the authentication thread */ | 691 | /* Start the authentication thread */ |
693 | if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, socks) == -1) { | 692 | if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, socks) == -1) { |
@@ -1130,9 +1129,8 @@ sshpam_passwd_conv(int n, sshpam_const struct pam_message **msg, | |||
1130 | if (n <= 0 || n > PAM_MAX_NUM_MSG) | 1129 | if (n <= 0 || n > PAM_MAX_NUM_MSG) |
1131 | return (PAM_CONV_ERR); | 1130 | return (PAM_CONV_ERR); |
1132 | 1131 | ||
1133 | if ((reply = malloc(n * sizeof(*reply))) == NULL) | 1132 | if ((reply = calloc(n, sizeof(*reply))) == NULL) |
1134 | return (PAM_CONV_ERR); | 1133 | return (PAM_CONV_ERR); |
1135 | memset(reply, 0, n * sizeof(*reply)); | ||
1136 | 1134 | ||
1137 | for (i = 0; i < n; ++i) { | 1135 | for (i = 0; i < n; ++i) { |
1138 | switch (PAM_MSG_MEMBER(msg, i, msg_style)) { | 1136 | switch (PAM_MSG_MEMBER(msg, i, msg_style)) { |