Bug 1283380 - Enable DB tests on LSan runs r=franziskus

1 files changed, 9 insertions, 3 deletions

diff --git a/cmd/dbtest/dbtest.c b/cmd/dbtest/dbtest.c
index 2f1ea6d38..9a6a034a6 100644
--- a/cmd/dbtest/dbtest.c
+++ b/cmd/dbtest/dbtest.c
@@ -120,13 +120,18 @@ main(int argc, char **argv)
                 break;
         }
     }
+    PL_DestroyOptState(optstate);
     if (optstatus == PL_OPT_BAD)
         Usage(progName);
 
-    if (!dbDir) {
-        dbDir = SECU_DefaultSSLDir(); /* Look in $SSL_DIR */
+    if (dbDir) {
+        char *tmp = dbDir;
+        dbDir = SECU_ConfigDirectory(tmp);
+        PORT_Free(tmp);
+    } else {
+        /* Look in $SSL_DIR */
+        dbDir = SECU_ConfigDirectory(SECU_DefaultSSLDir());
     }
-    dbDir = SECU_ConfigDirectory(dbDir);
     PR_fprintf(PR_STDERR, "dbdir selected is %s\n\n", dbDir);
 
     if (dbDir[0] == '\0') {
@@ -162,6 +167,7 @@ main(int argc, char **argv)
                     PR_fprintf(PR_STDERR, errStrings[FILE_NOT_WRITEABLE_ERR],
                                dbString);
                 }
+                PR_smprintf_free(dbString);
             }
         }
     }