]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-ldap: Do not call NULL callback
authorAki Tuomi <aki.tuomi@dovecot.fi>
Mon, 11 Apr 2016 14:27:31 +0000 (17:27 +0300)
committerAki Tuomi <aki.tuomi@dovecot.fi>
Wed, 13 Apr 2016 05:57:52 +0000 (08:57 +0300)
src/lib-ldap/ldap-connection.c

index 4c9516ade041194180c3403c12a684954b3914e3..741dfe202647cf8a740bbe171b77969155917673 100644 (file)
@@ -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++) {