- (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal

diff --git a/ChangeLog b/ChangeLog
index 2d0acf62ac59c1fe5eeb0da69ef9b627025c9396..32308719132d0e162e7a70b1978d69e3ff62d04a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030730
+ - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal
+
 20030726
  - (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW ->
    DISABLE_SHADOW.  Fixes HP-UX compile error.

diff --git a/auth-pam.c b/auth-pam.c
index 33ec14a7d6abfdd2d4913930e4d5a293eaa75c7b..a613f6dd43683137484324ba8bd53e7712c9249e 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -373,6 +373,7 @@ sshpam_query(void *ctx, char **name, char **info,
        size_t plen;
        u_char type;
        char *msg;
+       size_t len;
 
        buffer_init(&buffer);
        *name = xstrdup("");
@@ -388,16 +389,18 @@ sshpam_query(void *ctx, char **name, char **info,
                case PAM_PROMPT_ECHO_ON:
                case PAM_PROMPT_ECHO_OFF:
                        *num = 1;
-                       **prompts = xrealloc(**prompts, plen + strlen(msg) + 1);
-                       plen += sprintf(**prompts + plen, "%s", msg);
+                       len = plen + strlen(msg) + 1;
+                       **prompts = xrealloc(**prompts, len);
+                       plen += snprintf(**prompts + plen, len, "%s", msg);
                        **echo_on = (type == PAM_PROMPT_ECHO_ON);
                        xfree(msg);
                        return (0);
                case PAM_ERROR_MSG:
                case PAM_TEXT_INFO:
                        /* accumulate messages */
-                       **prompts = xrealloc(**prompts, plen + strlen(msg) + 1);
-                       plen += sprintf(**prompts + plen, "%s", msg);
+                       len = plen + strlen(msg) + 1;
+                       **prompts = xrealloc(**prompts, len);
+                       plen += snprintf(**prompts + plen, len, "%s", msg);
                        xfree(msg);
                        break;
                case PAM_NEW_AUTHTOK_REQD: