xrealloc -> xreallocarray in portable code too.

diff --git a/auth-pam.c b/auth-pam.c
index d789bad7b9bd6e5b1605862be19f381ea493cac5..d94c8285bba4d8938f1e0f25657b4a3c408d53f4 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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);

diff --git a/uidswap.c b/uidswap.c
index c339283af74746d9aab314936d5bd45892bb3c92..f2713fdba15f267e230aa161561484e7291db0f7 100644 (file)
--- a/uidswap.c
+++ b/uidswap.c
@@ -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));