summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdb_lock.c
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2014-03-11 18:57:08 +1100
committerMartin Schwenke <martins@samba.org>2014-03-28 03:30:09 +0100
commitd1c8f8d63506c099e2ee9be7cb91f0fac4a8d848 (patch)
tree3dacdbb3422ee2290812d20ad086d1b8478cf1b8 /ctdb/server/ctdb_lock.c
parentff1c85ae279a87d9ce23955b02a68814f1f846f1 (diff)
downloadsamba-d1c8f8d63506c099e2ee9be7cb91f0fac4a8d848.tar.gz
samba-d1c8f8d63506c099e2ee9be7cb91f0fac4a8d848.tar.xz
samba-d1c8f8d63506c099e2ee9be7cb91f0fac4a8d848.zip
ctdb-locking: Check for talloc_memdup error
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/ctdb_lock.c')
-rw-r--r--ctdb/server/ctdb_lock.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index c588c8b1169..9d3b7c10034 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -927,6 +927,11 @@ static struct lock_request *ctdb_lock_internal(struct ctdb_context *ctdb,
lock_ctx->key.dsize = key.dsize;
if (key.dsize > 0) {
lock_ctx->key.dptr = talloc_memdup(lock_ctx, key.dptr, key.dsize);
+ if (lock_ctx->key.dptr == NULL) {
+ DEBUG(DEBUG_ERR, (__location__ "Memory allocation error\n"));
+ talloc_free(lock_ctx);
+ return NULL;
+ }
} else {
lock_ctx->key.dptr = NULL;
}