[tor-commits] [tor/maint-0.3.4] Work around check-spaces.

[nickm@xxxxxxxxxxxxxx]

commit db3acb3aa398bda46435d94427967410da173222
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Nov 14 07:54:57 2018 -0500

    Work around check-spaces.
---
 src/tools/tor_runner.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c
index 7c43b0d24..cad57a766 100644
--- a/src/tools/tor_runner.c
+++ b/src/tools/tor_runner.c
@@ -80,6 +80,7 @@ tor_run_main(const tor_main_configuration_t *cfg)
 /* circumlocution to avoid getting warned about calling calloc instead of
  * tor_calloc. */
 #define real_calloc calloc
+#define real_free free
 
 static void
 child(const tor_main_configuration_t *cfg)
@@ -93,10 +94,9 @@ child(const tor_main_configuration_t *cfg)
   int rv = execv(BINDIR "/tor", args);
 
   if (rv < 0) {
-    free(args);
+    real_free(args);
     exit(254);
   } else {
     abort(); /* Unreachable */
   }
 }
-



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits