torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #19063: Add check in utility macro

Browse Source
This commit is contained in:
U+039b
2016-06-18 18:43:44 +02:00
committed by Nick Mathewson
parent 81cfd5c9a1
commit 58e6a6aaeb
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/util.c
+3
View File
@@ -1111,6 +1111,9 @@ tor_digest256_is_zero(const char *digest)
/* Were there unexpected unconverted characters? */ \
if (!next && *endptr) \
goto err; \
/* Illogical (max, min) inputs? */ \
if (max < min) \
goto err; \
/* Is r within limits? */ \
if (r < min || r > max) \
goto err; \
src/test/test_util.c
+5
View File
@@ -1501,6 +1501,11 @@ test_util_strmisc(void *arg)
tt_int_op(-50L,OP_EQ, tor_parse_long("-50 plus garbage",10,-100,100,&i,&cp));
tt_int_op(1,OP_EQ, i);
tt_str_op(cp,OP_EQ, " plus garbage");
/* Illogical min max */
tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,4,&i,NULL));
tt_int_op(0,OP_EQ, i);
tt_int_op(0L,OP_EQ, tor_parse_long("-50",10,100,-100,&i,NULL));
tt_int_op(0,OP_EQ, i);
/* Out of bounds */
tt_int_op(0L,OP_EQ, tor_parse_long("10",10,50,100,&i,NULL));
tt_int_op(0,OP_EQ, i);