From: Martin Schwenke <martin@meltin.net>
Date: Wed, 2 Mar 2016 04:28:01 +0000 (+1100)
Subject: ctdb-killtcp: Avoid CTDB_NO_MEMORY()
X-Git-Tag: tdb-1.3.9~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bf494f6934e96f812f870b5c59ddd49fc9c3148;p=thirdparty%2Fsamba.git

ctdb-killtcp: Avoid CTDB_NO_MEMORY()

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

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 05ca459c0d9..a6088d63bb0 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -2884,7 +2884,10 @@ static int ctdb_killtcp_add_connection(struct ctdb_context *ctdb,
 	 */
 	if (killtcp == NULL) {
 		killtcp = talloc_zero(vnn, struct ctdb_kill_tcp);
-		CTDB_NO_MEMORY(ctdb, killtcp);
+		if (killtcp == NULL) {
+			DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+			return -1;
+		}
 
 		killtcp->vnn         = vnn;
 		killtcp->ctdb        = ctdb;
@@ -2901,7 +2904,10 @@ static int ctdb_killtcp_add_connection(struct ctdb_context *ctdb,
 	   RST and store it in killtcp->connections
 	*/
 	con = talloc(killtcp, struct ctdb_killtcp_con);
-	CTDB_NO_MEMORY(ctdb, con);
+	if (con == NULL) {
+		DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+		return -1;
+	}
 	con->src_addr = src;
 	con->dst_addr = dst;
 	con->count    = 0;