[dovecot-cvs] dovecot/src/lib-dict dict-client.c,1.8,1.8.2.1

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-dict
In directory talvi:/tmp/cvs-serv15211

Modified Files:
      Tag: branch_1_0
	dict-client.c 
Log Message:
t_pop() calls were missing from some error handling paths



Index: dict-client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-dict/dict-client.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- dict-client.c	26 Feb 2006 10:05:07 -0000	1.8
+++ dict-client.c	14 Jun 2006 12:20:20 -0000	1.8.2.1
@@ -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;
 		}