ctdb-daemon: Replace some uses of CTDB_NO_MEMORY_FATAL()

Also add a missing out-of-memory check for vnn->ifaces.

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 66bf92c8d9d2c03f0b173d492eb9b6699086c9dd..0dbef03660cbedccf5654408eb0335818bcda366 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1070,15 +1070,35 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
 
        /* create a new vnn structure for this ip address */
        vnn = talloc_zero(ctdb, struct ctdb_vnn);
-       CTDB_NO_MEMORY_FATAL(ctdb, vnn);
+       if (vnn == NULL) {
+               DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+               return -1;
+       }
        vnn->ifaces = talloc_array(vnn, const char *, num + 2);
+       if (vnn->ifaces == NULL) {
+               DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+               talloc_free(vnn);
+               return -1;
+       }
        tmp = talloc_strdup(vnn, ifaces);
-       CTDB_NO_MEMORY_FATAL(ctdb, tmp);
+       if (tmp == NULL) {
+               DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+               talloc_free(vnn);
+               return -1;
+       }
        for (iface = strtok(tmp, ","); iface; iface = strtok(NULL, ",")) {
                vnn->ifaces = talloc_realloc(vnn, vnn->ifaces, const char *, num + 2);
-               CTDB_NO_MEMORY_FATAL(ctdb, vnn->ifaces);
+               if (vnn->ifaces == NULL) {
+                       DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+                       talloc_free(vnn);
+                       return -1;
+               }
                vnn->ifaces[num] = talloc_strdup(vnn, iface);
-               CTDB_NO_MEMORY_FATAL(ctdb, vnn->ifaces[num]);
+               if (vnn->ifaces[num] == NULL) {
+                       DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+                       talloc_free(vnn);
+                       return -1;
+               }
                num++;
        }
        talloc_free(tmp);