nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.0

Browse Source
This commit is contained in:
Nick Mathewson 2017-09-12 17:09:47 -04:00
commit dedafe95fe
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug15582 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Avoid compiler warnings in the unit tests for running tor_sscanf()
with wide string outputs. Fixes bug 15582; bugfix on 0.2.6.2-alpha.

21
src/test/test_util.c
View File

@ -2518,7 +2518,7 @@ test_util_sscanf(void *arg)
{ {
unsigned u1, u2, u3; unsigned u1, u2, u3;
unsigned long ulng; unsigned long ulng;
char s1[20], s2[10], s3[10], ch; char s1[20], s2[10], s3[10], ch, *huge = NULL;
int r; int r;
long lng1,lng2; long lng1,lng2;
int int1, int2; int int1, int2;
@ -2530,7 +2530,13 @@ test_util_sscanf(void *arg)
tt_int_op(-1,OP_EQ, tt_int_op(-1,OP_EQ,
tor_sscanf("wrong", "%5c", s1)); /* %c cannot have a number. */ tor_sscanf("wrong", "%5c", s1)); /* %c cannot have a number. */
tt_int_op(-1,OP_EQ, tor_sscanf("hello", "%s", s1)); /* %s needs a number. */ tt_int_op(-1,OP_EQ, tor_sscanf("hello", "%s", s1)); /* %s needs a number. */
tt_int_op(-1,OP_EQ, tor_sscanf("prettylongstring", "%999999s", s1)); /* this will fail because we don't allow widths longer than 9999 */
{
huge = tor_malloc(1000000);
r = tor_sscanf("prettylongstring", "%99999s", huge);
tor_free(huge);
tt_int_op(-1,OP_EQ, r);
}
#if 0 #if 0
/* GCC thinks these two are illegal. */ /* GCC thinks these two are illegal. */
test_eq(-1, tor_sscanf("prettylongstring", "%0s", s1)); test_eq(-1, tor_sscanf("prettylongstring", "%0s", s1));
@ -2636,8 +2642,13 @@ test_util_sscanf(void *arg)
tt_int_op(2,OP_EQ, tor_sscanf("76trombones", "%6u%9s", &u1, s1)); /* %u%s */ tt_int_op(2,OP_EQ, tor_sscanf("76trombones", "%6u%9s", &u1, s1)); /* %u%s */
tt_int_op(76,OP_EQ, u1); tt_int_op(76,OP_EQ, u1);
tt_str_op(s1,OP_EQ, "trombones"); tt_str_op(s1,OP_EQ, "trombones");
tt_int_op(1,OP_EQ, tor_sscanf("prettylongstring", "%999s", s1)); {
tt_str_op(s1,OP_EQ, "prettylongstring"); huge = tor_malloc(1000);
r = tor_sscanf("prettylongstring", "%999s", huge);
tt_int_op(1,OP_EQ, r);
tt_str_op(huge,OP_EQ, "prettylongstring");
tor_free(huge);
}
/* %s doesn't eat spaces */ /* %s doesn't eat spaces */
tt_int_op(2,OP_EQ, tor_sscanf("hello world", "%9s %9s", s1, s2)); tt_int_op(2,OP_EQ, tor_sscanf("hello world", "%9s %9s", s1, s2));
tt_str_op(s1,OP_EQ, "hello"); tt_str_op(s1,OP_EQ, "hello");
@ -2861,7 +2872,7 @@ test_util_sscanf(void *arg)
test_feq(d4, 3.2); test_feq(d4, 3.2);
done: done:
; tor_free(huge);
} }
#define tt_char_op(a,op,b) tt_assert_op_type(a,op,b,char,"%c") #define tt_char_op(a,op,b) tt_assert_op_type(a,op,b,char,"%c")