From 3d8e1c62134fe5e98edef167ce88f473adda722a Mon Sep 17 00:00:00 2001

From: Mark Reynolds <mreynolds@redhat.com>

Date: Wed, 5 Jun 2019 14:09:52 -0400

Subject: [PATCH] Ticket 50431 - Fix covscan warnings

Description:  Most coverity errors happen when something fails.

https://pagure.io/389-ds-base/issue/50431

Reviewed by: firstyear & spichugi(Thanks!)

---

 autogen.sh                                    |  8 ++-

 ldap/servers/plugins/acl/acl.c                | 15 ++---

 ldap/servers/plugins/acl/acleffectiverights.c | 12 ++--

 ldap/servers/plugins/acl/acllist.c            |  4 +-

 .../plugins/linkedattrs/linked_attrs.c        |  4 +-

 .../plugins/memberof/memberof_config.c        | 12 +++-

 .../plugins/posix-winsync/posix-winsync.c     |  2 +-

 ldap/servers/plugins/replication/cl5_api.c    |  1 +

 .../plugins/replication/repl5_replica.c       |  2 +-

 .../replication/repl5_replica_config.c        |  8 ++-

 ldap/servers/plugins/replication/urp.c        |  1 +

 ldap/servers/plugins/roles/roles_cache.c      |  2 +

 ldap/servers/plugins/views/views.c            | 16 ++++--

 ldap/servers/slapd/agtmmap.c                  |  2 +-

 ldap/servers/slapd/back-ldbm/dblayer.c        | 55 ++++++++++--------

 ldap/servers/slapd/back-ldbm/index.c          |  9 +--

 ldap/servers/slapd/back-ldbm/ldbm_add.c       |  3 +-

 .../slapd/back-ldbm/ldbm_attrcrypt_config.c   |  4 +-

 ldap/servers/slapd/back-ldbm/ldbm_delete.c    |  3 +-

 ldap/servers/slapd/back-ldbm/ldif2ldbm.c      |  4 +-

 ldap/servers/slapd/back-ldbm/vlv_srch.c       |  3 +-

 ldap/servers/slapd/connection.c               |  1 +

 ldap/servers/slapd/dse.c                      |  7 ++-

 ldap/servers/slapd/entrywsi.c                 | 57 ++++++++++---------

 ldap/servers/slapd/main.c                     |  9 +--

 ldap/servers/slapd/mapping_tree.c             | 46 +++++++--------

 ldap/servers/slapd/modify.c                   |  6 +-

 ldap/servers/slapd/opshared.c                 |  3 +-

 ldap/servers/slapd/plugin_internal_op.c       |  3 +-

 ldap/servers/slapd/plugin_syntax.c            |  4 +-

 ldap/servers/slapd/rdn.c                      |  5 +-

 ldap/servers/slapd/sasl_map.c                 |  4 +-

 ldap/servers/slapd/schema.c                   |  6 +-

 ldap/servers/slapd/search.c                   |  7 ++-

 ldap/servers/slapd/tools/dbscan.c             |  9 ++-

 ldap/servers/slapd/tools/ldclt/ldapfct.c      |  8 +--

 ldap/servers/slapd/tools/ldclt/ldclt.c        |  2 +-

 ldap/servers/slapd/tools/ldif.c               | 10 +++-

 ldap/servers/slapd/tools/mmldif.c             |  5 +-

 ldap/servers/slapd/tools/pwenc.c              |  1 +

 ldap/servers/slapd/tools/rsearch/infadd.c     |  2 +-

 ldap/servers/slapd/tools/rsearch/rsearch.c    |  5 +-

 lib/ldaputil/certmap.c                        | 15 ++---

 lib/libaccess/usrcache.cpp                    |  6 +-

 .../389-console/src/lib/database/chaining.jsx |  2 +-

 .../389-console/src/lib/database/suffix.jsx   |  4 +-

 src/cockpit/389-console/src/replication.js    |  2 +-

 src/lib389/lib389/agreement.py                |  1 +

 src/lib389/lib389/backend.py                  |  8 ++-

 src/lib389/lib389/cli_conf/backend.py         |  2 +-

 50 files changed, 229 insertions(+), 181 deletions(-)

diff --git a/autogen.sh b/autogen.sh

index 8bb628b25..06a5facd1 100755

--- a/autogen.sh

+++ b/autogen.sh

@@ -35,12 +35,16 @@ checkvers() {

     vers="$1"; shift

     needmaj="$1"; shift

     needmin="$1"; shift

-    needrev="$1"; shift

+    if [ "$#" != "0" ]; then

+        needrev="$1"; shift

+    fi

     verslist=`echo $vers | tr '.' ' '`

     set $verslist

     maj=$1; shift

     min=$1; shift

-    rev=$1; shift

+    if [ "$#" != "0" ]; then

+        rev=$1; shift

+    fi

     if [ "$maj" -gt "$needmaj" ] ; then return 0; fi

     if [ "$maj" -lt "$needmaj" ] ; then return 1; fi

     # if we got here, maj == needmaj

diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c

index 6d105f4fa..5680de669 100644

--- a/ldap/servers/plugins/acl/acl.c

+++ b/ldap/servers/plugins/acl/acl.c

@@ -644,7 +644,8 @@ cleanup_and_ret:

     if (aclpb)

         aclpb->aclpb_curr_attrEval = NULL;

-    print_access_control_summary("main", ret_val, clientDn, aclpb, right,

+    print_access_control_summary("main", ret_val, clientDn, aclpb,

+                                 (right ? right : "NULL"),

                                  (attr ? attr : "NULL"), n_edn,

                                  &decision_reason);

     TNF_PROBE_0_DEBUG(acl_cleanup_end, "ACL", "");

@@ -2590,12 +2591,9 @@ acl__resource_match_aci(Acl_PBlock *aclpb, aci_t *aci, int skip_attrEval, int *a

          * that applies to the current attribute.

          * Then the (attribute,value) pair being added/deleted better

          * match that filter.

-         *

-         *

          */

-

         Targetattrfilter **attrFilterArray = NULL;

-        Targetattrfilter *attrFilter;

+        Targetattrfilter *attrFilter = NULL;

         int found = 0;

         if ((aclpb->aclpb_access & ACLPB_SLAPI_ACL_WRITE_ADD) &&

@@ -2606,15 +2604,13 @@ acl__resource_match_aci(Acl_PBlock *aclpb, aci_t *aci, int skip_attrEval, int *a

             attrFilterArray = aci->targetAttrDelFilters;

         }

-

         /*

          * Scan this filter list for an applicable filter.

          */

-

         found = 0;

         num_attrs = 0;

-        while (attrFilterArray[num_attrs] && !found) {

+        while (attrFilterArray && attrFilterArray[num_attrs] && !found) {

             attrFilter = attrFilterArray[num_attrs];

             /* If this filter applies to the attribute, stop. */

@@ -2630,8 +2626,7 @@ acl__resource_match_aci(Acl_PBlock *aclpb, aci_t *aci, int skip_attrEval, int *a

          * Here, if found an applicable filter, then apply the filter to the

          * (attr,val) pair.

          * Otherwise, ignore the targetattrfilters.

-        */

-

+         */

         if (found) {

             if (acl__make_filter_test_entry(&aclpb->aclpb_filter_test_entry,

diff --git a/ldap/servers/plugins/acl/acleffectiverights.c b/ldap/servers/plugins/acl/acleffectiverights.c

index 8a0cb9122..5dd46a064 100644

--- a/ldap/servers/plugins/acl/acleffectiverights.c

+++ b/ldap/servers/plugins/acl/acleffectiverights.c

@@ -869,14 +869,14 @@ _ger_generate_template_entry(

         if (dntype) {

             siz += strlen(dntype) + 30 + strlen(object) + strlen(dn);

         } else {

-            siz += strlen(attrs[0]) + 30 + strlen(object) + strlen(dn);

+            siz += strlen(attrs[0] ? attrs[0] : "") + 30 + strlen(object) + strlen(dn);

         }

     } else {

         /* dn: <attr>=<template_name>\n\0 */

         if (dntype) {

             siz += strlen(dntype) + 30 + strlen(object);

         } else {

-            siz += strlen(attrs[0]) + 30 + strlen(object);

+            siz += strlen(attrs[0] ? attrs[0] : "") + 30 + strlen(object);

         }

     }

     templateentry = (char *)slapi_ch_malloc(siz);

@@ -1030,7 +1030,9 @@ bailout:

      * slapi_pblock_set() will free any previous data, and

      * pblock_done() will free SLAPI_PB_RESULT_TEXT.

      */

-    slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, gerstr);

+    if (gerstr) {

+        slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, gerstr);

+    }

     if (!iscritical) {

         /*

@@ -1040,7 +1042,7 @@ bailout:

         rc = LDAP_SUCCESS;

     }

-    slapi_ch_free((void **)&subjectndn);

-    slapi_ch_free((void **)&gerstr);

+    slapi_ch_free_string(&subjectndn);

+    slapi_ch_free_string(&gerstr);

     return rc;

 }

diff --git a/ldap/servers/plugins/acl/acllist.c b/ldap/servers/plugins/acl/acllist.c

index 79786b723..e80c567c3 100644

--- a/ldap/servers/plugins/acl/acllist.c

+++ b/ldap/servers/plugins/acl/acllist.c

@@ -255,7 +255,9 @@ __acllist_add_aci(aci_t *aci)

                 t_aci = t_aci->aci_next;

             /* Now add the new one to the end of the list */

-            t_aci->aci_next = aci;

+            if (t_aci) {

+                t_aci->aci_next = aci;

+            }

             slapi_log_err(SLAPI_LOG_ACL, plugin_name, "__acllist_add_aci - Added the ACL:%s to existing container:[%d]%s\n",

                           aci->aclName, head->acic_index, slapi_sdn_get_ndn(head->acic_sdn));

diff --git a/ldap/servers/plugins/linkedattrs/linked_attrs.c b/ldap/servers/plugins/linkedattrs/linked_attrs.c

index f6eee1957..4f9fb102b 100644

--- a/ldap/servers/plugins/linkedattrs/linked_attrs.c

+++ b/ldap/servers/plugins/linkedattrs/linked_attrs.c

@@ -1256,7 +1256,9 @@ linked_attrs_del_backpointers(Slapi_PBlock *pb, char *linkdn, struct configEntry

         slapi_pblock_get(pb, SLAPI_ENTRY_PRE_OP, &pre_e);

         slapi_entry_attr_find(pre_e, config->linktype, &pre_attr);

-        slapi_attr_get_valueset(pre_attr, &vals);

+        if (pre_attr) {

+            slapi_attr_get_valueset(pre_attr, &vals);

+        }

     } else {

         vals = slapi_valueset_new();

         slapi_valueset_set_from_smod(vals, smod);

diff --git a/ldap/servers/plugins/memberof/memberof_config.c b/ldap/servers/plugins/memberof/memberof_config.c

index 89fd012e7..124217ee0 100644

--- a/ldap/servers/plugins/memberof/memberof_config.c

+++ b/ldap/servers/plugins/memberof/memberof_config.c

@@ -550,13 +550,17 @@ memberof_apply_config(Slapi_PBlock *pb __attribute__((unused)),

         }

         /* Build the new list */

-        for (i = 0; theConfig.group_slapiattrs && theConfig.groupattrs && theConfig.groupattrs[i]; i++) {

+        for (i = 0; theConfig.group_slapiattrs && theConfig.group_slapiattrs[i] &&

+                    theConfig.groupattrs && theConfig.groupattrs[i]; i++)

+        {

             theConfig.group_slapiattrs[i] = slapi_attr_new();

             slapi_attr_init(theConfig.group_slapiattrs[i], theConfig.groupattrs[i]);

         }

         /* Terminate the list. */

-        theConfig.group_slapiattrs[i] = NULL;

+        if (theConfig.group_slapiattrs) {

+            theConfig.group_slapiattrs[i] = NULL;

+        }

         /* The filter is based off of the groupattr, so we update it here too. */

         slapi_filter_free(theConfig.group_filter, 1);

@@ -736,7 +740,9 @@ memberof_copy_config(MemberOfConfig *dest, MemberOfConfig *src)

             }

             /* Terminate the array. */

-            dest->group_slapiattrs[i] = NULL;

+            if (dest->group_slapiattrs) {

+                dest->group_slapiattrs[i] = NULL;

+            }

         }

         if (src->memberof_attr) {

diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c

index 8e5ca4fff..c56e55f49 100644

--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c

+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c

@@ -1114,7 +1114,7 @@ posix_winsync_pre_ds_mod_group_cb(void *cbdata __attribute__((unused)),

         slapi_value_init_string(voc, "posixGroup");

         slapi_entry_attr_find(ds_entry, "objectClass", &oc_attr);

-        if (slapi_attr_value_find(oc_attr, slapi_value_get_berval(voc)) != 0) {

+        if (oc_attr && slapi_attr_value_find(oc_attr, slapi_value_get_berval(voc)) != 0) {

             Slapi_ValueSet *oc_vs = NULL;

             Slapi_Value *oc_nv = slapi_value_new();

diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c

index c035db290..6b5b28b0b 100644

--- a/ldap/servers/plugins/replication/cl5_api.c

+++ b/ldap/servers/plugins/replication/cl5_api.c

@@ -2749,6 +2749,7 @@ _cl5UpgradeMajor(char *fromVersion, char *toVersion)

     if (rc != CL5_SUCCESS) {

         slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name_cl,

                       "_cl5UpgradeMajor - Failed to open the db env\n");

+        s_cl5Desc.dbOpenMode = backup;

         return rc;

     }

     s_cl5Desc.dbOpenMode = backup;

diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c

index b3d619862..6a5363e43 100644

--- a/ldap/servers/plugins/replication/repl5_replica.c

+++ b/ldap/servers/plugins/replication/repl5_replica.c

@@ -2317,7 +2317,7 @@ replica_check_for_tasks(time_t when __attribute__((unused)), void *arg)

                         "missing original task flag.  Aborting abort task!\n",

                         clean_vals[i]);

                 replica_delete_task_config(e, (char *)type_replicaAbortCleanRUV, orig_val);

-                goto done;

+                goto done2;

             }

             if (!is_cleaned_rid(rid)) {

diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c

index 02b645f41..7649aa14e 100644

--- a/ldap/servers/plugins/replication/repl5_replica_config.c

+++ b/ldap/servers/plugins/replication/repl5_replica_config.c

@@ -223,6 +223,7 @@ replica_config_add(Slapi_PBlock *pb __attribute__((unused)),

               }

               slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "replica_config_add - "MSG_NOREPLICANORMRDN);

               slapi_rdn_free(&replicardn);

+              slapi_ch_free_string(&replica_root);

               *returncode = LDAP_UNWILLING_TO_PERFORM;

               return SLAPI_DSE_CALLBACK_ERROR;

           } else {

@@ -232,6 +233,7 @@ replica_config_add(Slapi_PBlock *pb __attribute__((unused)),

                  }

                  slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name,"replica_config_add - "MSG_CNREPLICA, nrdn, REPLICA_RDN);

                  slapi_rdn_free(&replicardn);

+                 slapi_ch_free_string(&replica_root);

                  *returncode = LDAP_UNWILLING_TO_PERFORM;

                  return SLAPI_DSE_CALLBACK_ERROR;

              }

@@ -242,6 +244,7 @@ replica_config_add(Slapi_PBlock *pb __attribute__((unused)),

             strcpy(errortext, MSG_NOREPLICARDN);

         }

         slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name, "replica_config_add - "MSG_NOREPLICARDN);

+        slapi_ch_free_string(&replica_root);

         *returncode = LDAP_UNWILLING_TO_PERFORM;

         return SLAPI_DSE_CALLBACK_ERROR;

     }

@@ -287,7 +290,7 @@ done:

     PR_Unlock(s_configLock);

     /* slapi_ch_free accepts NULL pointer */

-    slapi_ch_free((void **)&replica_root);

+    slapi_ch_free_string(&replica_root);

     if (*returncode != LDAP_SUCCESS) {

         if (mtnode_ext->replica)

@@ -2083,7 +2086,6 @@ check_replicas_are_done_cleaning(cleanruv_data *data)

     while (not_all_cleaned && !is_task_aborted(data->rid) && !slapi_is_shutting_down()) {

         agmt_obj = agmtlist_get_first_agreement_for_replica(data->replica);

         if (agmt_obj == NULL) {

-            not_all_cleaned = 0;

             break;

         }

         while (agmt_obj && !slapi_is_shutting_down()) {

@@ -2196,7 +2198,6 @@ check_replicas_are_done_aborting(cleanruv_data *data)

     while (not_all_aborted && !slapi_is_shutting_down()) {

         agmt_obj = agmtlist_get_first_agreement_for_replica(data->replica);

         if (agmt_obj == NULL) {

-            not_all_aborted = 0;

             break;

         }

         while (agmt_obj && !slapi_is_shutting_down()) {

@@ -2803,6 +2804,7 @@ delete_cleaned_rid_config(cleanruv_data *clean_data)

                             cleanruv_log(clean_data->task, clean_data->rid, CLEANALLRUV_ID, SLAPI_LOG_ERR,

                                     "delete_cleaned_rid_config - Failed to remove task data from (%s) error (%d), rid (%d)",

                                     edn, rc, clean_data->rid);

+                            slapi_ch_array_free(attr_val);

                             goto bail;

                         }

                     }

diff --git a/ldap/servers/plugins/replication/urp.c b/ldap/servers/plugins/replication/urp.c

index 37fe77379..b134409e4 100644

--- a/ldap/servers/plugins/replication/urp.c

+++ b/ldap/servers/plugins/replication/urp.c

@@ -1602,6 +1602,7 @@ urp_find_tombstone_for_glue (Slapi_PBlock *pb, char *sessionid, const Slapi_Entr

     for (int i = 0; entries && (entries[i] != NULL); i++) {

         char *tombstone_csn_value = slapi_entry_attr_get_charptr(entries[i], "nstombstonecsn");

         if (tombstone_csn_value) {

+            csn_free(&tombstone_csn);

             tombstone_csn = csn_new_by_string(tombstone_csn_value);

             slapi_ch_free_string(&tombstone_csn_value);

             if( csn_compare(tombstone_csn, conflict_csn) > 0 ) {

diff --git a/ldap/servers/plugins/roles/roles_cache.c b/ldap/servers/plugins/roles/roles_cache.c

index 1e5865af8..4e3b0af54 100644

--- a/ldap/servers/plugins/roles/roles_cache.c

+++ b/ldap/servers/plugins/roles/roles_cache.c

@@ -1276,6 +1276,8 @@ roles_cache_create_object_from_entry(Slapi_Entry *role_entry, role_object **resu

     if (rc == 0) {

         *result = this_role;

+    } else {

+        slapi_ch_free((void **)&this_role);

     }

     slapi_log_err(SLAPI_LOG_PLUGIN, ROLES_PLUGIN_SUBSYSTEM,

diff --git a/ldap/servers/plugins/views/views.c b/ldap/servers/plugins/views/views.c

index 6f784f599..5d8464761 100644

--- a/ldap/servers/plugins/views/views.c

+++ b/ldap/servers/plugins/views/views.c

@@ -783,10 +783,12 @@ views_cache_create_applied_filter(viewEntry *pView)

                           "views_cache_create_applied_filter - View filter [%s] in entry [%s] is not valid\n",

                           buf, current->pDn);

         }

-        if (pBuiltFilter && pCurrentFilter)

+        if (pBuiltFilter && pCurrentFilter) {

             pBuiltFilter = slapi_filter_join_ex(LDAP_FILTER_AND, pBuiltFilter, pCurrentFilter, 0);

-        else

+        } else {

+            slapi_filter_free(pBuiltFilter, 1);

             pBuiltFilter = pCurrentFilter;

+        }

         slapi_ch_free((void **)&buf;;

@@ -952,10 +954,12 @@ views_cache_create_descendent_filter(viewEntry *ancestor, PRBool useEntryID)

                               "views_cache_create_descendent_filter - View filter [%s] in entry [%s] is invalid\n",

                               buf, currentChild->pDn);

             }

-            if (pOrSubFilter && pCurrentFilter)

+            if (pOrSubFilter && pCurrentFilter) {

                 pOrSubFilter = slapi_filter_join_ex(LDAP_FILTER_OR, pOrSubFilter, pCurrentFilter, 0);

-            else

+            } else {

+                slapi_filter_free(pOrSubFilter, 1);

                 pOrSubFilter = pCurrentFilter;

+            }

             PR_smprintf_free(buf);

         }

@@ -1756,7 +1760,9 @@ view_search_rewrite_callback(Slapi_PBlock *pb)

 #endif

     /* make it happen */

-    slapi_pblock_set(pb, SLAPI_SEARCH_FILTER, outFilter);

+    if (outFilter) {

+        slapi_pblock_set(pb, SLAPI_SEARCH_FILTER, outFilter);

+    }

     ret = -2;

diff --git a/ldap/servers/slapd/agtmmap.c b/ldap/servers/slapd/agtmmap.c

index 352ccefda..bc5fe1ee1 100644

--- a/ldap/servers/slapd/agtmmap.c

+++ b/ldap/servers/slapd/agtmmap.c

@@ -243,7 +243,7 @@ agt_mread_stats(int hdl, struct hdr_stats_t *pHdrInfo, struct ops_stats_t *pDsOp

         return (EINVAL); /* Inavlid handle */

     }

-    if (mmap_tbl[hdl].fp <= (caddr_t)0) {

+    if (mmap_tbl[hdl].fp <= 0) {

         return (EFAULT); /* Something got corrupted */

     }

diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c

index f813447b6..1fee8050a 100644

--- a/ldap/servers/slapd/back-ldbm/dblayer.c

+++ b/ldap/servers/slapd/back-ldbm/dblayer.c

@@ -3009,7 +3009,7 @@ dblayer_erase_index_file_ex(backend *be, struct attrinfo *a, PRBool use_lock, in

     ldbm_instance *inst = NULL;

     dblayer_handle *handle = NULL;

     char dbName[MAXPATHLEN] = {0};

-    char *dbNamep;

+    char *dbNamep = NULL;

     char *p;

     int dbbasenamelen, dbnamelen;

     int rc = 0;

@@ -3102,11 +3102,12 @@ dblayer_erase_index_file_ex(backend *be, struct attrinfo *a, PRBool use_lock, in

                 sprintf(p, "%c%s%s", get_sep(dbNamep), a->ai_type, LDBM_FILENAME_SUFFIX);

                 rc = dblayer_db_remove_ex(pEnv, dbNamep, 0, 0);

                 a->ai_dblayer = NULL;

-                if (dbNamep != dbName)

-                    slapi_ch_free_string(&dbNamep);

             } else {

                 rc = -1;

             }

+            if (dbNamep != dbName) {

+                slapi_ch_free_string(&dbNamep);

+            }

             slapi_ch_free((void **)&handle);

         } else {

             /* no handle to close */

@@ -5661,7 +5662,9 @@ dblayer_copy_directory(struct ldbminfo *li,

                                               inst_dir, MAXPATHLEN);

         if (!inst_dirp || !*inst_dirp) {

             slapi_log_err(SLAPI_LOG_ERR, "dblayer_copy_directory", "Instance dir is NULL.\n");

-            slapi_ch_free_string(&inst_dirp);

+            if (inst_dirp != inst_dir) {

+                slapi_ch_free_string(&inst_dirp);

+            }

             return return_value;

         }

         len = strlen(inst_dirp);

@@ -5975,7 +5978,9 @@ dblayer_backup(struct ldbminfo *li, char *dest_dir, Slapi_Task *task)

                     slapi_task_log_notice(task,

                                           "Backup: Instance dir is empty\n");

                 }

-                slapi_ch_free_string(&inst_dirp);

+                if (inst_dirp != inst_dir) {

+                    slapi_ch_free_string(&inst_dirp);

+                }

                 return_value = -1;

                 goto bail;

             }

@@ -5993,8 +5998,9 @@ dblayer_backup(struct ldbminfo *li, char *dest_dir, Slapi_Task *task)

                                           "(%s -> %s): err=%d\n",

                                           inst_dirp, dest_dir, return_value);

                 }

-                if (inst_dirp != inst_dir)

+                if (inst_dirp != inst_dir) {

                     slapi_ch_free_string(&inst_dirp);

+                }

                 goto bail;

             }

             if (inst_dirp != inst_dir)

@@ -6292,7 +6298,6 @@ dblayer_copy_dirand_contents(char *src_dir, char *dst_dir, int mode, Slapi_Task

                 break;

             }

-

             PR_snprintf(filename1, MAXPATHLEN, "%s/%s", src_dir, direntry->name);

             PR_snprintf(filename2, MAXPATHLEN, "%s/%s", dst_dir, direntry->name);

             slapi_log_err(SLAPI_LOG_ERR, "dblayer_copy_dirand_contents", "Moving file %s\n",

@@ -6305,8 +6310,7 @@ dblayer_copy_dirand_contents(char *src_dir, char *dst_dir, int mode, Slapi_Task

                                                             mode, task);

                 if (return_value) {

                     if (task) {

-                        slapi_task_log_notice(task,

-                                              "Failed to copy directory %s", filename1);

+                        slapi_task_log_notice(task, "Failed to copy directory %s", filename1);

                     }

                     break;

                 }

@@ -6523,13 +6527,13 @@ dblayer_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task, char *bena

         return LDAP_UNWILLING_TO_PERFORM;

     }

     if (!dbversion_exists(li, src_dir)) {

-        slapi_log_err(SLAPI_LOG_ERR, "dblayer_restore", "Backup directory %s does not "

-                                                        "contain a complete backup\n",

+        slapi_log_err(SLAPI_LOG_ERR, "dblayer_restore",

+                      "Backup directory %s does not contain a complete backup\n",

                       src_dir);

         if (task) {

-            slapi_task_log_notice(task, "Restore: backup directory %s does not "

-                                        "contain a complete backup",

-                                  src_dir);

+            slapi_task_log_notice(task,

+                    "Restore: backup directory %s does not contain a complete backup",

+                    src_dir);

         }

         return LDAP_UNWILLING_TO_PERFORM;

     }

@@ -6585,13 +6589,10 @@ dblayer_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task, char *bena

                     }

                     if (slapd_comp_path(src_dir, inst->inst_parent_dir_name) == 0) {

                         slapi_log_err(SLAPI_LOG_ERR,

-                                      "dblayer_restore", "Backup dir %s and target dir %s "

-                                                         "are identical\n",

+                                      "dblayer_restore", "Backup dir %s and target dir %s are identical\n",

                                       src_dir, inst->inst_parent_dir_name);

                         if (task) {

                             slapi_task_log_notice(task,

-                                                  "Restore: backup dir %s and target dir %s "

-                                                  "are identical\n",

                                                   src_dir, inst->inst_parent_dir_name);

                         }

                         PR_CloseDir(dirhandle);

@@ -7060,8 +7061,12 @@ dblayer_get_instance_data_dir(backend *be)

     full_namep = dblayer_get_full_inst_dir(inst->inst_li, inst,

                                            full_name, MAXPATHLEN);

     if (!full_namep || !*full_namep) {

+        if (full_namep != full_name) {

+            slapi_ch_free_string(&full_namep);

+        }

         return ret;

     }

+

     /* Does this directory already exist? */

     if ((db_dir = PR_OpenDir(full_namep)) != NULL) {

         /* yep. */

@@ -7072,8 +7077,9 @@ dblayer_get_instance_data_dir(backend *be)

         ret = mkdir_p(full_namep, 0700);

     }

-    if (full_name != full_namep)

+    if (full_name != full_namep) {

         slapi_ch_free_string(&full_namep);

+    }

     return ret;

 }

@@ -7097,7 +7103,6 @@ dblayer_in_import(ldbm_instance *inst)

     inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,

                                           inst_dir, MAXPATHLEN);

     if (!inst_dirp || !*inst_dirp) {

-        slapi_ch_free_string(&inst_dirp);

         rval = -1;

         goto done;

     }

@@ -7117,8 +7122,9 @@ dblayer_in_import(ldbm_instance *inst)

     }

     PR_CloseDir(dirhandle);

 done:

-    if (inst_dirp != inst_dir)

+    if (inst_dirp != inst_dir) {

         slapi_ch_free_string(&inst_dirp);

+    }

     return rval;

 }

@@ -7149,7 +7155,9 @@ dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext)

     if (NULL == inst_dirp || '\0' == *inst_dirp) {

         slapi_log_err(SLAPI_LOG_ERR,

                       "dblayer_update_db_ext", "Instance dir is NULL\n");

-        slapi_ch_free_string(&inst_dirp);

+        if (inst_dirp != inst_dir) {

+            slapi_ch_free_string(&inst_dirp);

+        }

         return -1; /* non zero */

     }

     for (a = (struct attrinfo *)avl_getfirst(inst->inst_attrs);

@@ -7210,8 +7218,9 @@ dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext)

 done:

     slapi_ch_free_string(&ofile);

     slapi_ch_free_string(&nfile);

-    if (inst_dirp != inst_dir)

+    if (inst_dirp != inst_dir) {

         slapi_ch_free_string(&inst_dirp);

+    }

     return rval;

 }

diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c

index f0b969ff4..2a7529b81 100644

--- a/ldap/servers/slapd/back-ldbm/index.c

+++ b/ldap/servers/slapd/back-ldbm/index.c

@@ -1776,13 +1776,14 @@ index_range_read_ext(

     }

 #endif

 error:

+    slapi_log_err(SLAPI_LOG_TRACE, "index_range_read_ext", "(%s,%s) %lu candidates\n",

+                  type, prefix ? prefix : "", (u_long)IDL_NIDS(idl));

+

     index_free_prefix(prefix);

     DBT_FREE_PAYLOAD(cur_key);

     DBT_FREE_PAYLOAD(upperkey);

-

     dblayer_release_index_file(be, ai, db);

-    slapi_log_err(SLAPI_LOG_TRACE, "index_range_read_ext", "(%s,%s) %lu candidates\n",

-                  type, prefix, (u_long)IDL_NIDS(idl));

+

     return (idl);

 }

@@ -2406,7 +2407,7 @@ index_free_prefix(char *prefix)

         prefix == prefix_SUB) {

         /* do nothing */

     } else {

-        slapi_ch_free((void **)&prefix);

+        slapi_ch_free_string(&prefix);

     }

 }

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c

index 0d82ae92b..a2585575f 100644

--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c

+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c

@@ -162,7 +162,8 @@ ldbm_back_add(Slapi_PBlock *pb)

         txn.back_txn_txn = parent_txn;

     } else {

         parent_txn = txn.back_txn_txn;

-        slapi_pblock_set(pb, SLAPI_TXN, parent_txn);

+        if (parent_txn)

+            slapi_pblock_set(pb, SLAPI_TXN, parent_txn);

     }

     /* The dblock serializes writes to the database,

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c

index 9ecb09903..fd2c7dbc8 100644

--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c

+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c

@@ -142,7 +142,7 @@ ldbm_instance_attrcrypt_config_add_callback(Slapi_PBlock *pb __attribute__((unus

         /* If the cipher was invalid, return unwilling to perform */

         if (0 == cipher) {

-            returntext = "invalid cipher";

+            PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "invalid cipher");

             *returncode = LDAP_UNWILLING_TO_PERFORM;

             ret = SLAPI_DSE_CALLBACK_ERROR;

         } else {

@@ -167,7 +167,7 @@ ldbm_instance_attrcrypt_config_add_callback(Slapi_PBlock *pb __attribute__((unus

                 slapi_log_err(SLAPI_LOG_ERR, "ldbm_instance_attrcrypt_config_add_callback - "

                                              "Attempt to encryption on a non-existent attribute: %s\n",

                               attribute_name, 0, 0);

-                returntext = "attribute does not exist";

+                PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "attribute does not exist");

                 *returncode = LDAP_UNWILLING_TO_PERFORM;

                 ret = SLAPI_DSE_CALLBACK_ERROR;

             }

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c

index e9f3e32cc..76e37ae14 100644

--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c

+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c

@@ -113,7 +113,8 @@ ldbm_back_delete(Slapi_PBlock *pb)

         txn.back_txn_txn = parent_txn;

     } else {

         parent_txn = txn.back_txn_txn;

-        slapi_pblock_set(pb, SLAPI_TXN, parent_txn);

+        if (parent_txn)

+            slapi_pblock_set(pb, SLAPI_TXN, parent_txn);

     }

     if (pb_conn) {

diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c

index 60437f116..fb0fc5d1e 100644

--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c

+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c

@@ -1154,7 +1154,7 @@ ldbm_back_ldbm2ldif(Slapi_PBlock *pb)

     int task_flags;

     Slapi_Task *task;

     int run_from_cmdline = 0;

-    char *instance_name;

+    char *instance_name = NULL;

     ldbm_instance *inst = NULL;

     int str2entry_options = 0;

     int retry;

@@ -1203,11 +1203,11 @@ ldbm_back_ldbm2ldif(Slapi_PBlock *pb)

         goto bye;

     }

+    slapi_pblock_get(pb, SLAPI_BACKEND_INSTANCE_NAME, &instance_name);

     if (run_from_cmdline) {

         /* Now that we have processed the config information, we look for

          * the be that should do the db2ldif. */

-        slapi_pblock_get(pb, SLAPI_BACKEND_INSTANCE_NAME, &instance_name);

         inst = ldbm_instance_find_by_name(li, instance_name);

         if (NULL == inst) {

             slapi_task_log_notice(task, "Unknown backend instance: %s", instance_name);

diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.c b/ldap/servers/slapd/back-ldbm/vlv_srch.c

index 368417483..1ac3e009e 100644

--- a/ldap/servers/slapd/back-ldbm/vlv_srch.c

+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.c