diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-04-11 16:56:32 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-05-07 05:45:34 +0000 |
| commit | f78d9388fb459dc83fafb4da6e683e3137ad40e1 (patch) | |
| tree | f4603c181a73a1ee3ef6b081338b65f312c8872c /ctdb/tools | |
| parent | 95477e69e3e865cb4ee93f947074eef5c873750f (diff) | |
| download | samba-f78d9388fb459dc83fafb4da6e683e3137ad40e1.tar.gz | |
ctdb-tools: Fix ctdb dumpmemory to avoid printing trailing NUL
Fix ctdb rddumpmemory too.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13923
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tools')
| -rw-r--r-- | ctdb/tools/ctdb.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 8db0ec8e766..3c61c542ec4 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -2450,8 +2450,8 @@ static int control_dumpmemory(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, return ret; } - n = write(1, mem_str, strlen(mem_str)+1); - if (n < 0 || n != strlen(mem_str)+1) { + n = write(1, mem_str, strlen(mem_str)); + if (n < 0 || n != strlen(mem_str)) { fprintf(stderr, "Failed to write talloc summary\n"); return 1; } @@ -2462,10 +2462,12 @@ static int control_dumpmemory(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, static void dump_memory(uint64_t srvid, TDB_DATA data, void *private_data) { bool *done = (bool *)private_data; + size_t len; ssize_t n; - n = write(1, data.dptr, data.dsize); - if (n < 0 || n != data.dsize) { + len = strnlen((const char *)data.dptr, data.dsize); + n = write(1, data.dptr, len); + if (n < 0 || n != len) { fprintf(stderr, "Failed to write talloc summary\n"); } |