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

Merge remote-tracking branch 'tor-github/pr/1374'

Browse Source
This commit is contained in:
Nick Mathewson 2019-10-02 19:19:11 -04:00
commit bca30bcb90
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug31897 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (tests, SunOS):
- Avoid a map_anon_nofork test failure due to a signed/unsigned integer
comparison. Fixes bug 31897; bugfix on 0.4.1.1-alpha.

5
src/test/test_util.c
View File

@ -6189,6 +6189,7 @@ test_util_map_anon_nofork(void *arg)
* crash, or send zero. */ * crash, or send zero. */
char *ptr = NULL; char *ptr = NULL;
const char TEST_VALUE = 0xd0;
size_t sz = 16384; size_t sz = 16384;
int pipefd[2] = {-1, -1}; int pipefd[2] = {-1, -1};
unsigned inherit=0; unsigned inherit=0;
@ -6196,7 +6197,7 @@ test_util_map_anon_nofork(void *arg)
tor_munmap_anonymous(ptr, sz); tor_munmap_anonymous(ptr, sz);
ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT, &inherit); ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT, &inherit);
tt_ptr_op(ptr, OP_NE, 0); tt_ptr_op(ptr, OP_NE, 0);
memset(ptr, 0xd0, sz); memset(ptr, TEST_VALUE, sz);
tt_int_op(0, OP_EQ, pipe(pipefd)); tt_int_op(0, OP_EQ, pipe(pipefd));
pid_t child = fork(); pid_t child = fork();
@ -6227,7 +6228,7 @@ test_util_map_anon_nofork(void *arg)
// noinherit isn't implemented. // noinherit isn't implemented.
tt_int_op(inherit, OP_EQ, INHERIT_RES_KEEP); tt_int_op(inherit, OP_EQ, INHERIT_RES_KEEP);
tt_int_op((int)r, OP_EQ, 1); // child should send us a byte. tt_int_op((int)r, OP_EQ, 1); // child should send us a byte.
tt_int_op(buf[0], OP_EQ, 0xd0); // that byte should what we set it to. tt_int_op(buf[0], OP_EQ, TEST_VALUE); // that byte should be TEST_VALUE.
} }
int ws; int ws;