Attachment 149315 Details for Bug 231093 – cvs diff dblayer.c

[patch] cvs diff dblayer.c

dblayer.c.diff (text/plain), 12.18 KB, created by Noriko Hosoi on 2007-03-06 02:45:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-03-06 02:45:16 UTC

Size: 12.18 KB

patch

obsolete

>Index: dblayer.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
>retrieving revision 1.17
>diff -t -w -U4 -r1.17 dblayer.c
>--- dblayer.c	12 Feb 2007 21:13:07 -0000	1.17
>+++ dblayer.c	6 Mar 2007 02:44:22 -0000
>@@ -345,9 +345,9 @@
>     /* Remove the memory regions */
>     dblayer_private *priv = (dblayer_private*)li->li_dblayer_private;
>     DB_ENV *pEnv = priv->dblayer_env->dblayer_DB_ENV;
>     char *home_dir = dblayer_get_home_dir(li, NULL);
>-    if (home_dir)
>+    if (home_dir && *home_dir)
>         pEnv->remove(pEnv, home_dir, DB_FORCE);
> }
> 
> /* Callback function for libdb to spit error info into our log */
>@@ -1152,9 +1152,10 @@
>         }
>     }
>     home_dir = dblayer_get_home_dir(li, NULL);
>     /* user specified db home */
>-    if (!charray_utf8_inlist(priv->dblayer_data_directories, home_dir))
>+    if (home_dir && *home_dir &&
>+        !charray_utf8_inlist(priv->dblayer_data_directories, home_dir))
>     {
>         charray_add(&(priv->dblayer_data_directories), home_dir);
>     }
> 
>@@ -1205,8 +1206,12 @@
>     }
>     else
>     {
>         parent_dir = dblayer_get_home_dir(li, NULL);
>+        if (!parent_dir || !*parent_dir) {
>+            buf = NULL;
>+            return buf;
>+        }
>         mylen = strlen(parent_dir);
>         inst->inst_parent_dir_name = slapi_ch_strdup(parent_dir);
>     }
> 
>@@ -1752,10 +1757,16 @@
>         return -1;
>     }
> 
>     inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN);
>+    if (inst_dirp && *inst_dirp) {
>     return_value = dblayer_grok_directory(inst_dirp,
>                                           DBLAYER_DIRECTORY_READWRITE_ACCESS);
>+    } else {
>+        LDAPDebug(LDAP_DEBUG_ANY,"Can't start because the database instance "
>+                      "directory is NULL\n", 0, 0, 0);
>+        goto errout;
>+    }
>     if (0 != return_value) {
>         LDAPDebug(LDAP_DEBUG_ANY,"Can't start because the database instance "
>                       "directory \"%s\" either doesn't exist, "
>                       "or the db files are not accessible\n",
>@@ -2135,10 +2146,19 @@
>     memcpy(priv, opriv, sizeof(dblayer_private));
>     priv->dblayer_spin_count = 0;
> 
>     inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN);
>-    priv->dblayer_home_directory =
>-            slapi_ch_smprintf("%s/dbenv", inst_dirp);
>+    if (inst_dirp && *inst_dirp)
>+    {
>+        priv->dblayer_home_directory = slapi_ch_smprintf("%s/dbenv", inst_dirp);
>+    }
>+    else
>+    {
>+        LDAPDebug(LDAP_DEBUG_ANY,
>+          "Instance dir is NULL: persistent id2entry is not available\n",
>+          0, 0, 0);
>+        goto done;
>+    }
>     priv->dblayer_log_directory = slapi_ch_strdup(priv->dblayer_home_directory);
> 
>     prst = PR_GetFileInfo(inst_dirp, &prfinfo);
>     if (PR_FAILURE == prst || PR_FILE_DIRECTORY != prfinfo.type)
>@@ -2262,9 +2282,12 @@
>     }
> 
>     inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,
>                                           inst_dir, MAXPATHLEN);
>+    if (inst_dirp && *inst_dirp)
>+    {
>     envdir = slapi_ch_smprintf("%s/dbenv", inst_dirp);
>+    }
> 
> done:
>     if (pDB)
>        pDB->close(pDB, 0);
>@@ -2335,9 +2358,15 @@
>        if (return_value == 0) {
>          char inst_dir[MAXPATHLEN];
>          char *inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,
>                                                      inst_dir, MAXPATHLEN);
>+         if (inst_dirp && *inst_dir) {
>          return_value = env->remove(env, inst_dirp, 0);
>+         }
>+         else
>+         {
>+           return_value = -1;
>+         }
>          if (return_value == EBUSY) {
>            return_value = 0; /* something else is using the env so ignore */
>          }
>          if (inst_dirp != inst_dir)
>@@ -2669,17 +2698,24 @@
>         char *abs_file_name = NULL;
>         /* create a file with abs path, then try again */
> 
>         inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN);
>+        if (!inst_dirp || !*inst_dirp)
>+        {
>+            return_value = -1;
>+            goto out;
>+        }
>         abs_file_name = slapi_ch_smprintf("%s%c%s",
>                 inst_dirp, get_sep(inst_dirp), file_name);
>         DB_OPEN(pENV->dblayer_openflags,
>                 dbp, NULL/* txnid */, abs_file_name, subname, DB_BTREE,
>                 open_flags, priv->dblayer_file_mode, return_value);
>         dbp->close(dbp, 0);
>         return_value = db_create(ppDB, pENV->dblayer_DB_ENV, 0);
>         if (0 != return_value)
>+        {
>             goto out;
>+        }
>         dbp = *ppDB;
> 
>         slapi_ch_free_string(&abs_file_name);
>         if (inst_dirp != inst_dir)
>@@ -2894,9 +2930,9 @@
>   struct ldbminfo *li = (struct ldbminfo *) be->be_database->plg_private;
>   dblayer_private *priv = (dblayer_private*) li->li_dblayer_private;
>   struct dblayer_private_env *pEnv = priv->dblayer_env;
>   ldbm_instance *inst = (ldbm_instance *) be->be_instance_info;
>-  dblayer_handle *handle;
>+  dblayer_handle *handle = NULL;
>   char dbName[MAXPATHLEN];
>   char *dbNamep;
>   char *p;
>   int dbbasenamelen, dbnamelen;
>@@ -2960,21 +2996,28 @@
>           }
>         }
>       }
>       dbNamep = dblayer_get_full_inst_dir(li, inst, dbName, MAXPATHLEN);
>+      if (dbNamep && *dbNamep) {
>       dbbasenamelen = strlen(dbNamep);
>       dbnamelen = dbbasenamelen + strlen(a->ai_type) + 6;
>       if (dbnamelen > MAXPATHLEN)
>       {
>         dbNamep = (char *)slapi_ch_realloc(dbNamep, dbnamelen);
>       }
>       p = dbNamep + dbbasenamelen;
>-      sprintf(p, "%c%s%s", get_sep(dbNamep), a->ai_type, LDBM_FILENAME_SUFFIX);
>+        sprintf(p, "%c%s%s",
>+                   get_sep(dbNamep), a->ai_type, LDBM_FILENAME_SUFFIX);
>       rc = dblayer_db_remove_ex(pEnv, dbNamep, 0, use_lock);
>       a->ai_dblayer = NULL;
>-      slapi_ch_free((void **)&handle);
>       if (dbNamep != dbName)
>         slapi_ch_free_string(&dbNamep);
>+      }
>+      else
>+      {
>+        rc = -1;
>+      }
>+      slapi_ch_free((void **)&handle);
>     } else {
>       /* no handle to close */
>     }
>     PR_Unlock(inst->inst_handle_list_mutex);
>@@ -3447,9 +3490,9 @@
>     INCR_THREAD_COUNT(priv);
> 
>     interval = PR_MillisecondsToInterval(DBLAYER_SLEEP_INTERVAL);
>     home_dir = dblayer_get_home_dir(li, NULL);
>-    if (NULL == home_dir)
>+    if (NULL == home_dir || '\0' == *home_dir)
>     {
>         LDAPDebug(LDAP_DEBUG_ANY, 
>             "Checkpoint thread failed due to missing db home directory info\n",
>             0, 0, 0);
>@@ -4100,18 +4143,25 @@
>     if (inst->inst_dir_name == NULL)
>         dblayer_get_instance_data_dir(inst->inst_be);
> 
>     inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN);
>+    if (inst_dirp && *inst_dirp) {
>     dirhandle = PR_OpenDir(inst_dirp);
>+    }
>     if (! dirhandle) {
>         if ( PR_GetError() == PR_FILE_NOT_FOUND_ERROR ) {
>              /* the directory does not exist... that's not an error */
>              rval = 0;
>              goto done;
>         }
>+        if (inst_dirp && *inst_dirp) {
>+            LDAPDebug(LDAP_DEBUG_ANY,
>+              "_dblayer_delete_instance_dir: inst_dir is NULL\n", 0, 0, 0);
>+        } else {
>         LDAPDebug(LDAP_DEBUG_ANY,
>             "_dblayer_delete_instance_dir: PR_OpenDir(%s) failed (%d): %s\n", 
>             inst_dirp, PR_GetError(),slapd_pr_strerror(PR_GetError()));
>+        }
>         rval = -1;
>         goto done;
>     }
> 
>@@ -4275,9 +4325,9 @@
>     else
>     {
>         log_dir = dblayer_get_home_dir(li, NULL);
>     }
>-        if (instance == NULL)
>+        if (instance == NULL && log_dir && *log_dir)
>         {
>                 ret = dblayer_delete_transaction_logs(log_dir);
>                 if(ret) {
>                   LDAPDebug(LDAP_DEBUG_ANY,
>@@ -4564,19 +4614,27 @@
>                   relative_instance_name, src_dir, 0);
>         return return_value;
>     }
> 
>-    inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,
>-                                          inst_dir, MAXPATHLEN);
>     if (is_fullpath(src_dir))
>         new_src_dir = src_dir;
>     else
>     {
>-        int len = strlen(inst_dirp);
>+        int len;
>+        inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,
>+                                              inst_dir, MAXPATHLEN);
>+        if (!inst_dirp || !*inst_dirp)
>+        {
>+            LDAPDebug(LDAP_DEBUG_ANY, "Instance dir is NULL.\n", 0, 0, 0);
>+            return return_value;
>+        }
>+        len = strlen(inst_dirp);
>         sep = get_sep(inst_dirp);
>         if (*(inst_dirp+len-1) == sep)
>             sep = '\0';
>         new_src_dir = slapi_ch_smprintf("%s%c%s", inst_dirp, sep, src_dir);
>+        if (inst_dirp != inst_dir)
>+            slapi_ch_free_string(&inst_dirp);
>     }
> 
>     dirhandle = PR_OpenDir(new_src_dir);
>     if (NULL == dirhandle)
>@@ -4618,8 +4676,12 @@
> 
>                 if (!is_fullpath(dest_dir))
>                 {
>                     prefix = dblayer_get_home_dir(li, NULL);
>+                    if (!prefix || !*prefix)
>+                    {
>+                        continue;
>+                    }
>                     mysep = get_sep(prefix);
>                 }
> 
>                 if (mysep)
>@@ -4710,9 +4772,9 @@
>     PR_ASSERT(NULL != li);
>     priv = (dblayer_private*)li->li_dblayer_private;
>     PR_ASSERT(NULL != priv);
>     home_dir = dblayer_get_home_dir(li, NULL);
>-    if (NULL == home_dir)
>+    if (NULL == home_dir || '\0' == *home_dir)
>     {
>         LDAPDebug(LDAP_DEBUG_ANY, 
>             "Backup failed due to missing db home directory info\n", 0, 0, 0);
>         return -1;
>@@ -4788,10 +4850,27 @@
>             char *inst_dirp = NULL;
>             inst = (ldbm_instance *)object_get_data(inst_obj);
>             inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,
>                                                     inst_dir, MAXPATHLEN);
>+            if (inst_dirp && *inst_dirp)
>+            {
>             return_value = dblayer_copy_directory(li, task, inst_dirp,
>                                         dest_dir, 0 /* backup */, &cnt, 0, 0, 0);
>+            }
>+            else
>+            {
>+                LDAPDebug(LDAP_DEBUG_ANY,
>+                          "ERROR: Instance dir is empty\n", 0, 0, 0);
>+                if (task) {
>+                    slapi_task_log_notice(task,
>+                          "ERROR: Instance dir is empty\n");
>+                }
>+                if (listA) {
>+                    free(listA);
>+                }
>+                dblayer_txn_abort(li,&txn);
>+                return -1;
>+            }
>             if (return_value != 0) {
>                 LDAPDebug(LDAP_DEBUG_ANY,
>                     "ERROR: error copying directory (%s -> %s): err=%d\n",
>                     inst_dirp, dest_dir, return_value);
>@@ -5265,9 +5344,9 @@
>     PR_Unlock(li->li_config_mutex);
> 
>     home_dir = dblayer_get_home_dir(li, NULL);
>     
>-    if (NULL == home_dir)
>+    if (NULL == home_dir || '\0' == *home_dir)
>     {
>         LDAPDebug(LDAP_DEBUG_ANY, 
>             "Restore failed due to missing db home directory info\n", 0, 0, 0);
>         return -1;
>@@ -5585,8 +5664,11 @@
>      * instance use it othewise use the ldbm-wide one 
>      */
>     full_namep = dblayer_get_full_inst_dir(inst->inst_li, inst,
>                                            full_name, MAXPATHLEN);
>+    if (!full_namep || !*full_namep) {
>+        return ret;
>+    }
>     /* Does this directory already exist? */
>     if ((db_dir = PR_OpenDir(full_namep)) != NULL) {
>         /* yep. */
>         PR_CloseDir(db_dir);
>@@ -5621,8 +5703,13 @@
>     int rval = 0;
> 
>     inst_dirp = dblayer_get_full_inst_dir(inst->inst_li, inst,
>                                           inst_dir, MAXPATHLEN);
>+    if (!inst_dirp || !*inst_dirp)
>+    {
>+        rval = -1;
>+        goto done;
>+    }
>     dirhandle = PR_OpenDir(inst_dirp);
> 
>     if (NULL == dirhandle)
>         goto done;
>@@ -5671,8 +5758,13 @@
>     be = inst->inst_be;
>     li = inst->inst_li;
>     priv = (dblayer_private*)li->li_dblayer_private;
>     inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN);
>+    if (!inst_dirp || *inst_dirp) {
>+        LDAPDebug(LDAP_DEBUG_ANY,
>+            "update_db_ext: instance dir is NULL\n", 0, 0, 0);
>+        return -1;    /* non zero */
>+    }
>     for (a = (struct attrinfo *)avl_getfirst(inst->inst_attrs);
>          NULL != a;
>          a = (struct attrinfo *)avl_getnext())
>     {

Actions: View | Diff

Attachments on bug 231093: 149315 | 276401 | 276431 | 276451 | 276461