summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gorrod <alexander.gorrod@mongodb.com>2016-09-05 16:09:47 +1000
committerGitHub <noreply@github.com>2016-09-05 16:09:47 +1000
commitcd933b92a78ac8992d41829064ddf22cce7ec9d7 (patch)
treee9d1a43b13815c8a5bc5f9e72bb246aeda66f797
parent80562960a04bce03d75f2de02ae893174ba21386 (diff)
downloadmongo-cd933b92a78ac8992d41829064ddf22cce7ec9d7.tar.gz
WT-2876 Fix a memory leak of new wtperf URI (#3021)
Also fix compiler warning on OS X
-rw-r--r--bench/wtperf/config.c3
-rw-r--r--bench/wtperf/wtperf.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/bench/wtperf/config.c b/bench/wtperf/config.c
index a2960902ec1..3366fda15f7 100644
--- a/bench/wtperf/config.c
+++ b/bench/wtperf/config.c
@@ -174,7 +174,10 @@ config_free(CONFIG *cfg)
free(cfg->monitor_dir);
free(cfg->partial_config);
free(cfg->reopen_config);
+
+ /* Free the various URIs */
free(cfg->base_uri);
+ free(cfg->log_table_uri);
if (cfg->uris != NULL) {
for (i = 0; i < cfg->table_count; i++)
diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index bef5f6b22b5..8fab2f82615 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -528,6 +528,7 @@ worker(void *arg)
cfg = thread->cfg;
conn = cfg->conn;
cursors = NULL;
+ log_table_cursor = NULL; /* -Wconditional-initialized */
ops = 0;
ops_per_txn = thread->workload->ops_per_txn;
session = NULL;