From e26a1b5f46a357cc891ac3b61a3238bbe8829768 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 28 Aug 2018 15:12:36 +0200 Subject: [PATCH] fix some format security issues fix places reported by '-Werror=format-security' in preperance to make this package debhelper level 9 compatible. Rename the touched 'str' variable to an actual name in this process Signed-off-by: Thomas Lamprecht --- data/src/dcdb.c | 10 +++++----- data/src/dfsm.c | 8 ++++---- data/src/pmxcfs.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/src/dcdb.c b/data/src/dcdb.c index 66d1b0f..12abf1d 100644 --- a/data/src/dcdb.c +++ b/data/src/dcdb.c @@ -632,8 +632,8 @@ dcdb_process_state_update( memdb_index_t *leaderidx = idx[leader]; localsi->master = leaderidx; - GString *str = g_string_new("synced members:"); - g_string_append_printf(str, " %d/%d", syncinfo->nodes[leader].nodeid, syncinfo->nodes[leader].pid); + GString *synced_member_ids = g_string_new(NULL); + g_string_append_printf(synced_member_ids, "%d/%d", syncinfo->nodes[leader].nodeid, syncinfo->nodes[leader].pid); for (int i = 0; i < syncinfo->node_count; i++) { dfsm_node_info_t *ni = &syncinfo->nodes[i]; @@ -643,14 +643,14 @@ dcdb_process_state_update( if (leaderidx->bytes == idx[i]->bytes && memcmp(leaderidx, idx[i], leaderidx->bytes) == 0) { ni->synced = 1; - g_string_append_printf(str, ", %d/%d", ni->nodeid, ni->pid); + g_string_append_printf(synced_member_ids, ", %d/%d", ni->nodeid, ni->pid); } } if (dfsm_nodeid_is_local(dfsm, ni->nodeid, ni->pid)) localsi->idx = idx[i]; } - cfs_message(str->str); - g_string_free(str, 1); + cfs_message("synced members: %s", synced_member_ids->str); + g_string_free(synced_member_ids, 1); /* send update */ if (dfsm_nodeid_is_local(dfsm, syncinfo->nodes[leader].nodeid, syncinfo->nodes[leader].pid)) { diff --git a/data/src/dfsm.c b/data/src/dfsm.c index cdf473e..e18fd5e 100644 --- a/data/src/dfsm.c +++ b/data/src/dfsm.c @@ -1137,10 +1137,10 @@ dfsm_cpg_confchg_callback( } int lowest_nodeid = 0; - GString *str = g_string_new("members: "); + GString *member_ids = g_string_new(NULL); for (int i = 0; i < member_list_entries; i++) { - g_string_append_printf(str, i ? ", %d/%d" : "%d/%d", + g_string_append_printf(member_ids, i ? ", %d/%d" : "%d/%d", member_list[i].nodeid, member_list[i].pid); if (lowest_nodeid == 0 || lowest_nodeid > member_list[i].nodeid) @@ -1153,9 +1153,9 @@ dfsm_cpg_confchg_callback( if ((dfsm->we_are_member || mode != DFSM_MODE_START)) - cfs_dom_message(dfsm->log_domain, str->str); + cfs_dom_message(dfsm->log_domain, "members: %s", member_ids->str); - g_string_free(str, 1); + g_string_free(member_ids, 1); dfsm->lowest_nodeid = lowest_nodeid; diff --git a/data/src/pmxcfs.c b/data/src/pmxcfs.c index b4bc08f..2fe7c59 100644 --- a/data/src/pmxcfs.c +++ b/data/src/pmxcfs.c @@ -81,7 +81,7 @@ static void glib_log_handler(const gchar *log_domain, gpointer user_data) { - cfs_log(log_domain, log_level, NULL, 0, NULL, message); + cfs_log(log_domain, log_level, NULL, 0, NULL, "%s", message); } static gboolean write_pidfile(pid_t pid) -- 2.39.2