summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-29 13:02:56 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-29 13:02:56 -0400
commit5ab23e03fa0a8bce11798cbf025139e9653b9be4 (patch)
tree276461c37fce85defa953fc1adb2926b6d6be181 /src/test
parentc08102ea777ddaaa8404021a1c8b84082f5eff8b (diff)
parentdf896ed6323f6f0493393f97e739501df8092e7f (diff)
downloadtor-5ab23e03fa0a8bce11798cbf025139e9653b9be4.tar.gz
tor-5ab23e03fa0a8bce11798cbf025139e9653b9be4.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_hs.c7
-rw-r--r--src/test/test_shared_random.c1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index 64448de510..07daebc164 100644
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -567,10 +567,10 @@ test_hs_auth_cookies(void *arg)
#define TEST_COOKIE_ENCODED_STEALTH "YWJjZGVmZ2hpamtsbW5vcB"
#define TEST_COOKIE_ENCODED_INVALID "YWJjZGVmZ2hpamtsbW5vcD"
- char *encoded_cookie;
+ char *encoded_cookie = NULL;
uint8_t raw_cookie[REND_DESC_COOKIE_LEN];
rend_auth_type_t auth_type;
- char *err_msg;
+ char *err_msg = NULL;
int re;
(void)arg;
@@ -616,6 +616,9 @@ test_hs_auth_cookies(void *arg)
tor_free(err_msg);
done:
+ tor_free(encoded_cookie);
+ tor_free(err_msg);
+
return;
}
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index f6ab0dfabd..34de6d258f 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -883,6 +883,7 @@ test_sr_setup_commits(void)
tt_assert(!commit_has_reveal_value(commit_d));
done:
+ tor_free(place_holder);
authority_cert_free(auth_cert);
}