[tor-commits] [tor/maint-0.3.2] Fix memory leak in unit test for bridge distribution config.

[nickm@xxxxxxxxxxxxxx]

commit a5b8b55c1c39febdb0f8a2bc0294e040da21869a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Nov 17 21:19:18 2017 -0500

    Fix memory leak in unit test for bridge distribution config.
    
    Also, check for the actual message, and fix some string confusion,
    while we're at it.
    
    Fixes bug 24345; bugfix on 0.3.2.3-alpha.
---
 changes/bug24345       | 3 +++
 src/test/test_config.c | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug24345 b/changes/bug24345
new file mode 100644
index 000000000..22eb41251
--- /dev/null
+++ b/changes/bug24345
@@ -0,0 +1,3 @@
+  o Minor bugfixes (tests):
+    - Fix a unit test in one of the bridge-distribution test cases.
+      Fixes bug 24345; bugfix on 0.3.2.3-alpha.
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 456d8bcc3..1c0dab39c 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -5454,7 +5454,7 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
   or_options_t* options = get_options_mutable();
   or_options_t* old_options = options;
   or_options_t* default_options = options;
-  char* message = (char*)("");
+  char* message = NULL;
   int ret;
 
   (void)arg;
@@ -5465,8 +5465,11 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
   ret = options_validate(old_options, options, default_options, 0, &message);
 
   tt_int_op(ret, OP_EQ, -1);
+  tt_str_op(message, OP_EQ, "You set BridgeDistribution, but you "
+            "didn't set BridgeRelay!");
  done:
-  return;
+  tor_free(message);
+  options->BridgeDistribution = NULL;
 }
 
 /* If the BridgeDistribution setting was valid, 0 should be returned. */

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