From 1fedeee10d4064921ecf3dd2758128be7ad962d4 Mon Sep 17 00:00:00 2001 From: Liviu Chircu Date: Thu, 14 Jan 2016 18:55:58 +0200 Subject: [PATCH] Coverity PR: minor refactorings (cherry picked from commit 975024142e724b315203dd14c58056a77f3d3959) Conflicts: modules/ldap/iniparser.c modules/usrloc/dlist.c --- evi/event_interface.c | 6 ++++-- modules/ldap/iniparser.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/evi/event_interface.c b/evi/event_interface.c index 6419ea5484..510514e78d 100644 --- a/evi/event_interface.c +++ b/evi/event_interface.c @@ -509,18 +509,20 @@ struct mi_root * mi_events_list(struct mi_root *cmd_tree, void *param) static int evi_print_subscriber(struct mi_node *rpl, evi_subs_p subs) { - evi_reply_sock *sock = subs != NULL ? subs->reply_sock : NULL; - struct mi_node *node = NULL; + evi_reply_sock *sock; + struct mi_node *node; str socket; if (!subs->trans_mod || !subs->trans_mod->print) { LM_ERR("subscriber does not have a print method exported\n"); return -1; } + node = add_mi_node_child(rpl, 0, "Subscriber", 10, 0, 0); if(node == NULL) return -1; + sock = subs->reply_sock; if (!sock) { LM_DBG("no socket specified\n"); if (!add_mi_attr(node, 0, "protocol", 8, diff --git a/modules/ldap/iniparser.c b/modules/ldap/iniparser.c index 15f9e19fed..12b9a3557a 100644 --- a/modules/ldap/iniparser.c +++ b/modules/ldap/iniparser.c @@ -563,8 +563,9 @@ output file pointers. snprintf(longkey, LONGKEYBUFF, "%s:%s", sec, key); } else { size_t len = strlen(sec); - longkey[LONGKEYBUFF-1]=0; - strncpy(longkey, sec, len >= LONGKEYBUFF ? LONGKEYBUFF-1 : len); + if (len > LONGKEYBUFF - 1) + len = LONGKEYBUFF - 1; + strncpy(longkey, sec, len + 1); } /* Add (key,val) to dictionary */