From cac7bab6c5bb83108008029e4ec0624b2a31ea7b Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Tue, 24 Feb 2015 15:35:59 -0800 Subject: [PATCH 21/40] Ticket #48048 - Fix coverity issues - 2015/2/24 Coverity defect 13059 - Resource leak Description: search_pb needs to be allocated after an error case. modified: syntax_validate_task_thread in syntaxes/validate_task.c --- ldap/servers/plugins/syntaxes/validate_task.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ldap/servers/plugins/syntaxes/validate_task.c b/ldap/servers/plugins/syntaxes/validate_task.c index 71b4b7e..9f9a143 100644 --- a/ldap/servers/plugins/syntaxes/validate_task.c +++ b/ldap/servers/plugins/syntaxes/validate_task.c @@ -199,7 +199,7 @@ syntax_validate_task_thread(void *arg) int rc = 0; Slapi_Task *task = (Slapi_Task *)arg; task_data *td = NULL; - Slapi_PBlock *search_pb = slapi_pblock_new(); + Slapi_PBlock *search_pb = NULL; if (!task) { return; /* no task */ @@ -220,14 +220,14 @@ syntax_validate_task_thread(void *arg) /* Perform the search and use a callback * to validate each matching entry. */ - slapi_search_internal_set_pb(search_pb, td->dn, - LDAP_SCOPE_SUBTREE, td->filter_str, 0, 0, - 0, 0, syntax_validate_get_plugin_id(), 0); + search_pb = slapi_pblock_new(); + slapi_search_internal_set_pb(search_pb, td->dn, + LDAP_SCOPE_SUBTREE, td->filter_str, 0, 0, + 0, 0, syntax_validate_get_plugin_id(), 0); - rc = slapi_search_internal_callback_pb(search_pb, - td, 0, syntax_validate_task_callback, 0); + rc = slapi_search_internal_callback_pb(search_pb, td, 0, syntax_validate_task_callback, 0); - slapi_pblock_destroy(search_pb); + slapi_pblock_destroy(search_pb); /* Log finished message. */ slapi_task_log_notice(task, "Syntax validate task complete. Found %" NSPRIu64 -- 1.9.3