From: Yawning Angel <yawning@schwanenlied.me>
Date: Mon, 6 Apr 2015 17:53:01 +0000 (+0000)
Subject: Fix the memory leak in `warn_if_option_path_is_relative()`.
X-Git-Tag: tor-0.2.7.1-alpha~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79544a6fc5342605a23773ba7d6fc2d863f1dd76;p=thirdparty%2Ftor.git

Fix the memory leak in `warn_if_option_path_is_relative()`.

Fixes coverity defect CID 1293337, not in any released version of tor.
---

diff --git a/src/or/config.c b/src/or/config.c
index d65d35dfc2..00de0b99b0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2558,10 +2558,12 @@ static void
 warn_if_option_path_is_relative(const char *option,
                                 char *filepath)
 {
-  if (filepath &&path_is_relative(filepath))
+  if (filepath && path_is_relative(filepath)) {
+    char *abs_path = make_path_absolute(filepath);
     COMPLAIN("Path for %s (%s) is relative and will resolve to %s."
-             " Is this what you wanted?",option,filepath,
-             make_path_absolute(filepath));
+             " Is this what you wanted?", option, filepath, abs_path);
+    tor_free(abs_path);
+  }
 }
 
 /** Scan <b>options</b> for occurances of relative file/directory