summaryrefslogtreecommitdiff
path: root/ctdb/protocol
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2016-04-21 23:56:13 +1000
committerMartin Schwenke <martins@samba.org>2016-05-03 04:43:19 +0200
commitc64435f22e977cd5e3406d018e069e5c7d9b709e (patch)
tree2b11f11feba4f031311a0a35a494f2819e77bf31 /ctdb/protocol
parent324ae757c37c45974e5188080ad9d03798aad043 (diff)
downloadsamba-c64435f22e977cd5e3406d018e069e5c7d9b709e.tar.gz
ctdb-protocol: Fix marshalling of TDB_DATA
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/protocol')
-rw-r--r--ctdb/protocol/protocol_types.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/protocol/protocol_types.c b/ctdb/protocol/protocol_types.c
index 868f55ab556..fa11bc2bcc2 100644
--- a/ctdb/protocol/protocol_types.c
+++ b/ctdb/protocol/protocol_types.c
@@ -2340,7 +2340,9 @@ size_t ctdb_tdb_data_len(TDB_DATA data)
void ctdb_tdb_data_push(TDB_DATA data, uint8_t *buf)
{
- memcpy(buf, data.dptr, data.dsize);
+ if (data.dsize > 0) {
+ memcpy(buf, data.dptr, data.dsize);
+ }
}
int ctdb_tdb_data_pull(uint8_t *buf, size_t buflen, TALLOC_CTX *mem_ctx,