From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Jun 2013 15:28:30 +0000 (-0400)
Subject: Fix a couple of resource leaks in test_config.c
X-Git-Tag: tor-0.2.5.1-alpha~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f8e672b50e07dcdfee1ba74e7f44570edaf0fe2;p=thirdparty%2Ftor.git

Fix a couple of resource leaks in test_config.c

Spotted by Coverity Scan. Not in any released Tor.
---

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 2a23e33a86..ad30cdf78f 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -193,7 +193,7 @@ test_config_check_or_create_data_subdir(void *arg)
   or_options_t *options = get_options_mutable();
   char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0"));
   const char *subdir = "test_stats";
-  const char *subpath = get_datadir_fname(subdir);
+  char *subpath = get_datadir_fname(subdir);
   struct stat st;
   int r;
 #if !defined (_WIN32) || defined (WINCE)
@@ -237,6 +237,7 @@ test_config_check_or_create_data_subdir(void *arg)
  done:
   rmdir(subpath);
   tor_free(datadir);
+  tor_free(subpath);
 }
 
 static void
@@ -261,8 +262,7 @@ test_config_write_to_data_subdir(void *arg)
       "accusam et justo duo dolores et\n"
       "ea rebum. Stet clita kasd gubergren, no sea takimata\n"
       "sanctus est Lorem ipsum dolor sit amet.";
-  const char* subpath = get_datadir_fname(subdir);
-  const char* filepath = get_datadir_fname2(subdir, fname);
+  char* filepath = get_datadir_fname2(subdir, fname);
   (void)arg;
 
 #if defined (_WIN32) && !defined (WINCE)
@@ -286,9 +286,9 @@ test_config_write_to_data_subdir(void *arg)
 
  done:
   remove(filepath);
-  rmdir(subpath);
   rmdir(options->DataDirectory);
   tor_free(datadir);
+  tor_free(filepath);
 }
 
 /* Test helper function: Make sure that a bridge line gets parsed