[Pkg-wmaker-commits] [wmbiff] 14/17: panther (mac 10.3) does not appear to null-terminate passwords in the keychain for us

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_18
in repository wmbiff.

commit 5e5ebcb60b23df107edb777d9e97339fef917c23
Author: bluehal <bluehal>
Date:   Fri Nov 7 09:11:26 2003 +0000

    panther (mac 10.3) does not appear to null-terminate passwords in the keychain for us
---
 wmbiff/passwordMgr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wmbiff/passwordMgr.c b/wmbiff/passwordMgr.c
index 84a4270..132081e 100644
--- a/wmbiff/passwordMgr.c
+++ b/wmbiff/passwordMgr.c
@@ -136,11 +136,12 @@ static void get_password_from_keychain(Pop3 pc, const char *username,
 	}
 
 	if (pwdlen < *password_len) {
-		strcpy(password, secpwd);
-		*password_len = strlen(password);
+		strncpy(password, secpwd, pwdlen);
+		password[pwdlen] = '\0';
+		*password_len = pwdlen;
 	} else {
 		DM(pc, DEBUG_ERROR,
-		   "passmgr: warning: your password appears longer (%d) than expected (%d)\n",
+		   "passmgr: warning: your password appears longer (%lu) than expected (%d)\n",
 		   strlen(secpwd), *password_len - 1);
 	}
 	rc = SecKeychainItemFreeContent(NULL, secpwd);
@@ -189,7 +190,7 @@ static void get_password_from_command(Pop3 pc, const char *username,
 		strncpy(password, password_ptr, *password_len);
 		if (password[*password_len - 1] != '\0') {
 			DM(pc, DEBUG_ERROR,
-			   "passmgr: warning: your password appears longer (%d) than expected (%d)\n",
+			   "passmgr: warning: your password appears longer (%lu) than expected (%d)\n",
 			   strlen(password_ptr), *password_len - 1);
 		}
 		free(password_ptr);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git