From 590bfe3d6df3c2cdcd8acde7444ec1a8e9ac8344 Mon Sep 17 00:00:00 2001 From: teor Date: Sun, 19 Feb 2017 22:47:47 +1100 Subject: [PATCH] Reject versions that have non-numeric prefixes Unit tests #21507. Part of #21470. --- src/test/test_dir.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index d3ec9beaa8..696d61cfb5 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1123,6 +1123,16 @@ test_dir_versions(void *arg) tt_int_op(-1, OP_EQ, tor_version_parse("0.-1.0", &ver1)); tt_int_op(-1, OP_EQ, tor_version_parse("0.-2147483648.0", &ver1)); tt_int_op(-1, OP_EQ, tor_version_parse("0.-4294967295.0", &ver1)); + /* In #21507, we reject version components with non-numeric prefixes */ + tt_int_op(-1, OP_EQ, tor_version_parse("0.-0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("+1.0.0", &ver1)); + /* use the list in isspace() */ + tt_int_op(-1, OP_EQ, tor_version_parse("0.\t0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\n0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\v0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\f0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0.\r0.0", &ver1)); + tt_int_op(-1, OP_EQ, tor_version_parse("0. 0.0", &ver1)); #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \