From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 11 Apr 2016 14:27:31 +0000 (+0300)
Subject: lib-ldap: Do not call NULL callback
X-Git-Tag: 2.2.24~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a4ddf45c3c76abf8ed60bf920d1de5331d775e;p=thirdparty%2Fdovecot%2Fcore.git

lib-ldap: Do not call NULL callback
---

diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index 4c9516ade0..741dfe2026 100644
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -227,7 +227,8 @@ void ldap_connection_send_next(struct ldap_connection *conn)
 
 		memset(&res, 0, sizeof(res));
 		res.openldap_ret = ret;
-		req->result_callback(&res, req->result_callback_ctx);
+		if (req->result_callback != NULL)
+			req->result_callback(&res, req->result_callback_ctx);
 
 		ldap_connection_request_destroy(&req);
 		aqueue_delete(conn->request_queue, i);
@@ -334,7 +335,8 @@ void ldap_connection_abort_request(struct ldap_op_queue_entry *req)
 	memset(&res, 0, sizeof(res));
 	res.openldap_ret = LDAP_TIMEOUT;
 	res.error_string = "Aborting LDAP request after timeout";
-	req->result_callback(&res, req->result_callback_ctx);
+	if (req->result_callback != NULL)
+		req->result_callback(&res, req->result_callback_ctx);
 
 	unsigned int n = aqueue_count(req->conn->request_queue);
 	for (unsigned int i = 0; i < n; i++) {