diff options
author | Darren Tucker <dtucker@zip.com.au> | 2015-04-30 09:18:11 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2015-04-30 09:18:11 +1000 |
commit | d1680d36e17244d9af3843aeb5025cb8e40d6c07 (patch) | |
tree | 8123d103e6ddb6bb6f1d9bf53d8177f6ab4eef0b | |
parent | 531a57a3893f9fcd4aaaba8c312b612bbbcc021e (diff) |
xrealloc -> xreallocarray in portable code too.
-rw-r--r-- | auth-pam.c | 4 | ||||
-rw-r--r-- | uidswap.c | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -738,7 +738,7 @@ sshpam_query(void *ctx, char **name, char **info, case PAM_PROMPT_ECHO_OFF: *num = 1; len = plen + mlen + 1; - **prompts = xrealloc(**prompts, 1, len); + **prompts = xreallocarray(**prompts, 1, len); strlcpy(**prompts + plen, msg, len - plen); plen += mlen; **echo_on = (type == PAM_PROMPT_ECHO_ON); @@ -748,7 +748,7 @@ sshpam_query(void *ctx, char **name, char **info, case PAM_TEXT_INFO: /* accumulate messages */ len = plen + mlen + 2; - **prompts = xrealloc(**prompts, 1, len); + **prompts = xreallocarray(**prompts, 1, len); strlcpy(**prompts + plen, msg, len - plen); plen += mlen; strlcat(**prompts + plen, "\n", len - plen); @@ -86,7 +86,7 @@ temporarily_use_uid(struct passwd *pw) if (saved_egroupslen < 0) fatal("getgroups: %.100s", strerror(errno)); if (saved_egroupslen > 0) { - saved_egroups = xrealloc(saved_egroups, + saved_egroups = xreallocarray(saved_egroups, saved_egroupslen, sizeof(gid_t)); if (getgroups(saved_egroupslen, saved_egroups) < 0) fatal("getgroups: %.100s", strerror(errno)); @@ -104,7 +104,7 @@ temporarily_use_uid(struct passwd *pw) if (user_groupslen < 0) fatal("getgroups: %.100s", strerror(errno)); if (user_groupslen > 0) { - user_groups = xrealloc(user_groups, + user_groups = xreallocarray(user_groups, user_groupslen, sizeof(gid_t)); if (getgroups(user_groupslen, user_groups) < 0) fatal("getgroups: %.100s", strerror(errno)); |