commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5
Merge: ccae991 0ee15c9
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Jul 5 13:42:26 2017 -0400
Merge branch 'maint-0.2.4' into maint-0.2.5
changes/bug22789 | 6 ++++++
src/common/compat.c | 8 ++++++--
src/test/test_addr.c | 9 +++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --cc src/test/test_addr.c
index 50011e6,645fc64..2c126e6
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@@ -346,9 -340,15 +346,18 @@@ test_addr_ip6_helpers(void
test_pton6_bad("a:::b:c");
test_pton6_bad(":::a:b:c");
test_pton6_bad("a:b:c:::");
+ test_pton6_bad("1.2.3.4");
+ test_pton6_bad(":1.2.3.4");
+ test_pton6_bad(".2.3.4");
+ /* Regression tests for 22789. */
+ test_pton6_bad("0xfoo");
+ test_pton6_bad("0x88");
+ test_pton6_bad("0xyxxy");
+ test_pton6_bad("0XFOO");
+ test_pton6_bad("0X88");
+ test_pton6_bad("0XYXXY");
+ test_pton6_bad("0x");
+ test_pton6_bad("0X");
/* test internal checking */
test_external_ip("fbff:ffff::2:7", 0);
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
