sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

ctdb-daemon: Replace some uses of CTDB_NO_MEMORY_FATAL()

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2016-08-20 20:29:04 +10:00 committed by Amitay Isaacs
parent d658d4e701
commit 05665d9ede
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ctdb/server/ctdb_takeover.c
View File

@ -1070,15 +1070,35 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
/* create a new vnn structure for this ip address */ /* create a new vnn structure for this ip address */
vnn = talloc_zero(ctdb, struct ctdb_vnn); 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); 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); 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, ",")) { for (iface = strtok(tmp, ","); iface; iface = strtok(NULL, ",")) {
vnn->ifaces = talloc_realloc(vnn, vnn->ifaces, const char *, num + 2); 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); 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++; num++;
} }
talloc_free(tmp); talloc_free(tmp);