Use calloc() instead of malloc(n * s) followed by memset().

From Jean-Philippe Ouellet.

diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
index 2e3a00e029a6a6f262581b37c4737ef976e60431..52357f82e87cf7084fb8b5039ae93cebe836f2a3 100644 (file)
--- a/doc/CONTRIBUTORS
+++ b/doc/CONTRIBUTORS
@@ -99,6 +99,7 @@ you believe you should be listed, please send a note to sudo@sudo.ws.
     Nieusma, Jeff
     Nikitser, Peter A.
     Nussel, Ludwig
+    Ouellet, Jean-Philippe
     Paquet, Eric
     Paradis, Chantal
     Percival, Ted

diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index bb034c9d89139a53688a9784acd6be5ece026d78..8749e2dc396624e9a9655f9666474cddb7097be3 100644 (file)
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -315,9 +315,8 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
     int ret = PAM_AUTH_ERR;
     debug_decl(converse, SUDO_DEBUG_AUTH)
 
-    if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL)
+    if ((*response = calloc(num_msg, sizeof(struct pam_response))) == NULL)
        debug_return_int(PAM_SYSTEM_ERR);
-    memset(*response, 0, num_msg * sizeof(struct pam_response));
 
     for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) {
        type = SUDO_CONV_PROMPT_ECHO_OFF;