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

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>
This commit is contained in:
Martin Schwenke 2019-04-11 16:56:32 +10:00 committed by Amitay Isaacs
parent 95477e69e3
commit f78d9388fb

View File

@ -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");
}