sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-20 14:03:59 +03:00
Code

ctdb-tools: Fix ctdb dumpmemory to avoid printing trailing NUL

Browse Source 
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>
(cherry picked from commit f78d9388fb459dc83fafb4da6e683e3137ad40e1)
This commit is contained in:
Martin Schwenke 2019-04-11 16:56:32 +10:00 committed by Karolin Seeger
parent 7db0d1a764
commit 08e229df43
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ctdb/tools/ctdb.c
View File

@ -2434,8 +2434,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;
}
@ -2446,10 +2446,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");
}