Mercurial > dovecot > original-hg > dovecot-1.2

changeset 4367:763401b5b344 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
t_pop() calls were missing from some error handling paths
author Timo Sirainen <tss@iki.fi>
date Fri, 16 Jun 2006 12:51:58 +0300
parents 5f0d649c26c3
children 51a1d0fbbc94
files src/lib-dict/dict-client.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dict/dict-client.c	Fri Jun 16 12:51:07 2006 +0300
+++ b/src/lib-dict/dict-client.c	Fri Jun 16 12:51:58 2006 +0300
@@ -195,6 +195,7 @@
 				dict->username, dict->uri);
 	if (client_dict_send_query(dict, query) < 0) {
 		client_dict_disconnect(dict);
+		t_pop();
 		return -1;
 	}
 	t_pop();
@@ -401,10 +402,7 @@
 		else if (ret == 0) {
 			/* read reply */
 			line = client_dict_read_line(dict);
-			if (line == NULL)
-				return -1;
-
-			if (*line != DICT_PROTOCOL_REPLY_OK)
+			if (line == NULL || *line != DICT_PROTOCOL_REPLY_OK)
 				ret = -1;
 		}