aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-07 23:03:04 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-07 23:03:04 -0400
commit595303fd1e1998e12c51901f1aea77311e973a44 (patch)
tree84b18b086564584369b02f7f735a0f98dd4679eb /src/test
parent84df7d73c9f8892220184e301627d5bddb9c3f79 (diff)
parent6d9c332757c96e691ddeb024bd41035490a505d7 (diff)
downloadtor-595303fd1e1998e12c51901f1aea77311e973a44.tar
tor-595303fd1e1998e12c51901f1aea77311e973a44.tar.gz
Merge remote-tracking branch 'public/bug10363_024_squashed'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_util.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c
index a471b8eb1..877fa840c 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1212,6 +1212,10 @@ test_util_strmisc(void)
test_assert(!tor_memmem(haystack, 4, "cde", 3));
haystack = "ababcad";
test_eq_ptr(tor_memmem(haystack, 7, "abc", 3), haystack + 2);
+ test_eq_ptr(tor_memmem(haystack, 7, "ad", 2), haystack + 5);
+ test_eq_ptr(tor_memmem(haystack, 7, "cad", 3), haystack + 4);
+ test_assert(!tor_memmem(haystack, 7, "dadad", 5));
+ test_assert(!tor_memmem(haystack, 7, "abcdefghij", 10));
/* memstr */
test_eq_ptr(tor_memstr(haystack, 7, "abc"), haystack + 2);
test_eq_ptr(tor_memstr(haystack, 7, "cad"), haystack + 4);