Mercurial > dovecot > original-hg > dovecot-1.2

changeset 5433:6f5ff9a7554f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Potential crashfix
author Timo Sirainen <tss@iki.fi>
date Tue, 27 Mar 2007 01:20:01 +0300
parents 2b4fa90860dd
children f768041d91e6
files src/imap-login/client-authenticate.c src/pop3-login/client-authenticate.c
diffstat 2 files changed, 8 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client-authenticate.c	Mon Mar 26 22:23:45 2007 +0300
+++ b/src/imap-login/client-authenticate.c	Tue Mar 27 01:20:01 2007 +0300
@@ -66,19 +66,16 @@
 	if (strcmp(line, "*") == 0) {
 		sasl_server_auth_client_error(&client->common,
 					      "Authentication aborted");
-		return;
-	}
-
-	if (client->common.waiting_auth_reply) {
+	} else if (client->common.waiting_auth_reply) {
 		sasl_server_auth_client_error(&client->common,
 					      "Don't send unrequested data");
 	} else {
 		auth_client_request_continue(client->common.auth_request, line);
 		client->common.waiting_auth_reply = TRUE;
+
+		/* clear sensitive data */
+		safe_memset(line, 0, strlen(line));
 	}
-
-	/* clear sensitive data */
-	safe_memset(line, 0, strlen(line));
 }
 
 static bool client_handle_args(struct imap_client *client,
--- a/src/pop3-login/client-authenticate.c	Mon Mar 26 22:23:45 2007 +0300
+++ b/src/pop3-login/client-authenticate.c	Tue Mar 27 01:20:01 2007 +0300
@@ -73,19 +73,16 @@
 	if (strcmp(line, "*") == 0) {
 		sasl_server_auth_client_error(&client->common,
 					      "Authentication aborted");
-		return;
-	}
-
-	if (client->common.waiting_auth_reply) {
+	} else if (client->common.waiting_auth_reply) {
 		sasl_server_auth_client_error(&client->common,
 					      "Don't send unrequested data");
 	} else {
 		auth_client_request_continue(client->common.auth_request, line);
 		client->common.waiting_auth_reply = TRUE;
+
+		/* clear sensitive data */
+		safe_memset(line, 0, strlen(line));
 	}
-
-	/* clear sensitive data */
-	safe_memset(line, 0, strlen(line));
 }
 
 static bool client_handle_args(struct pop3_client *client,