From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 5 Aug 2016 03:10:28 +0000 (+1000)
Subject: ctdb-client: transaction_cancel must free transaction handle
X-Git-Tag: tevent-0.9.30~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aa00035faeb307c061dc20e62a0ace7f2a1413b;p=thirdparty%2Fsamba.git

ctdb-client: transaction_cancel must free transaction handle

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12122

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 98de1b858b3..794119d2f0d 100644
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -2304,6 +2304,7 @@ static void ctdb_transaction_cancel_done(struct tevent_req *subreq)
 		DEBUG(DEBUG_ERR,
 		      ("transaction_cancel: %s g_lock unlock failed, ret=%d\n",
 		       state->h->db->db_name, ret));
+		talloc_free(state->h);
 		tevent_req_error(req, ret);
 		return;
 	}
@@ -2336,6 +2337,7 @@ int ctdb_transaction_cancel(struct ctdb_transaction_handle *h)
 
 	mem_ctx = talloc_new(NULL);
 	if (mem_ctx == NULL) {
+		talloc_free(h);
 		return ENOMEM;
 	}
 
@@ -2343,6 +2345,7 @@ int ctdb_transaction_cancel(struct ctdb_transaction_handle *h)
 					   tevent_timeval_zero(), h);
 	if (req == NULL) {
 		talloc_free(mem_ctx);
+		talloc_free(h);
 		return ENOMEM;
 	}