aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-07 23:20:13 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-07 23:20:13 -0400
commitf0bce2dc359dc2b3004af33541b27c495ad731f3 (patch)
tree78165f9661418243e4669dafffa737923f88c570 /src/test
parent595303fd1e1998e12c51901f1aea77311e973a44 (diff)
downloadtor-f0bce2dc359dc2b3004af33541b27c495ad731f3.tar
tor-f0bce2dc359dc2b3004af33541b27c495ad731f3.tar.gz
Fix some harmless/untriggerable memory leaks found by coverity
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_addr.c2
-rw-r--r--src/test/test_util.c28
2 files changed, 16 insertions, 14 deletions
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index eb25e0b48..cee2dcf2a 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -73,7 +73,7 @@ test_addr_basic(void)
}
done:
- ;
+ tor_free(cp);
}
#define test_op_ip6_(a,op,b,e1,e2) \
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 877fa840c..08efd453c 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1189,19 +1189,19 @@ test_util_strmisc(void)
}
/* Test str-foo functions */
- cp = tor_strdup("abcdef");
- test_assert(tor_strisnonupper(cp));
- cp[3] = 'D';
- test_assert(!tor_strisnonupper(cp));
- tor_strupper(cp);
- test_streq(cp, "ABCDEF");
- tor_strlower(cp);
- test_streq(cp, "abcdef");
- test_assert(tor_strisnonupper(cp));
- test_assert(tor_strisprint(cp));
- cp[3] = 3;
- test_assert(!tor_strisprint(cp));
- tor_free(cp);
+ cp_tmp = tor_strdup("abcdef");
+ test_assert(tor_strisnonupper(cp_tmp));
+ cp_tmp[3] = 'D';
+ test_assert(!tor_strisnonupper(cp_tmp));
+ tor_strupper(cp_tmp);
+ test_streq(cp_tmp, "ABCDEF");
+ tor_strlower(cp_tmp);
+ test_streq(cp_tmp, "abcdef");
+ test_assert(tor_strisnonupper(cp_tmp));
+ test_assert(tor_strisprint(cp_tmp));
+ cp_tmp[3] = 3;
+ test_assert(!tor_strisprint(cp_tmp));
+ tor_free(cp_tmp);
/* Test memmem and memstr */
{
@@ -2325,6 +2325,8 @@ test_util_listdir(void *ptr)
done:
tor_free(fname1);
tor_free(fname2);
+ tor_free(fname3);
+ tor_free(dir1);
tor_free(dirname);
if (dir_contents) {
SMARTLIST_FOREACH(dir_contents, char *, cp, tor_free(cp));