From 0081e1f61eb518dde1fd9e681f5cf63faba19afb Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 23 Jan 2012 11:41:01 -0500 Subject: - avoid a possible NULL deref --- src/back-shr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/back-shr.c') diff --git a/src/back-shr.c b/src/back-shr.c index c553b12..913e190 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -945,7 +945,7 @@ backend_shr_update_references_cb(const char *group, const char *set, set_data->group, set_data->set, slapi_entry_get_ndn(cbdata->e), - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); return TRUE; } else { @@ -957,7 +957,7 @@ backend_shr_update_references_cb(const char *group, const char *set, set_data->group, set_data->set, slapi_entry_get_ndn(cbdata->e), - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } } else { @@ -965,11 +965,11 @@ backend_shr_update_references_cb(const char *group, const char *set, state->plugin_desc->spd_id, "reference-based changes for " "\"%s\"/\"%s\" made in (\"%s\") " - "(%s in %s)\n", + "(%s in %s or empty)\n", set_data->group, set_data->set, slapi_entry_get_ndn(cbdata->e), - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } @@ -1700,7 +1700,7 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag, set_data->group, set_data->set, cbdata->ndn, - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); return TRUE; } else { @@ -1712,7 +1712,7 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag, set_data->group, set_data->set, cbdata->ndn, - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } } else { @@ -1720,11 +1720,11 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag, cbdata->state->plugin_desc->spd_id, "changes for " "\"%s\"/\"%s\" made in (\"%s\") " - "(%s in %s)\n", + "(%s in %s or empty)\n", set_data->group, set_data->set, cbdata->ndn, - cbdata->modlist, + cbdata->modlist ? cbdata->modlist : "", backend_shr_get_rel_attr_list(set_data)); } /* If the entry used to match the map, remove it. */ -- cgit