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

Add an assertion to read_file_to_str_until_eof

Browse Source 
The clangalyzer doesn't believe our math here.  I'm pretty sure our
math is right.  Also, add some unit tests.
This commit is contained in:
Nick Mathewson 2014-09-02 13:29:11 -04:00
parent 1a2f2c163f
commit 07a16b3372
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/util.c
View File

@ -2357,6 +2357,7 @@ read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out)
pos += r;
} while (r > 0 && pos < max_bytes_to_read);
tor_assert(pos < string_max);
*sz_out = pos;
string[pos] = '\0';
return string;

25
src/test/test_util.c
View File

@ -86,6 +86,20 @@ test_util_read_file_eof_tiny_limit(void *arg)
test_util_read_until_eof_impl("tor_test_fifo_tiny", 5, 4);
}
static void
test_util_read_file_eof_one_loop_a(void *arg)
{
(void)arg;
test_util_read_until_eof_impl("tor_test_fifo_1ka", 1024, 1023);
}
static void
test_util_read_file_eof_one_loop_b(void *arg)
{
(void)arg;
test_util_read_until_eof_impl("tor_test_fifo_1kb", 1024, 1024);
}
static void
test_util_read_file_eof_two_loops(void *arg)
{
@ -97,6 +111,14 @@ test_util_read_file_eof_two_loops(void *arg)
test_util_read_until_eof_impl("tor_test_fifo_2k", 2048, 10000);
}
static void
test_util_read_file_eof_two_loops_b(void *arg)
{
(void)arg;
test_util_read_until_eof_impl("tor_test_fifo_2kb", 2048, 2048);
}
static void
test_util_read_file_eof_zero_bytes(void *arg)
{
@ -3870,7 +3892,10 @@ struct testcase_t util_tests[] = {
UTIL_TEST(make_environment, 0),
UTIL_TEST(set_env_var_in_sl, 0),
UTIL_TEST(read_file_eof_tiny_limit, 0),
UTIL_TEST(read_file_eof_one_loop_a, 0),
UTIL_TEST(read_file_eof_one_loop_b, 0),
UTIL_TEST(read_file_eof_two_loops, 0),
UTIL_TEST(read_file_eof_two_loops_b, 0),
UTIL_TEST(read_file_eof_zero_bytes, 0),
UTIL_TEST(write_chunks_to_file, 0),
UTIL_TEST(mathlog, 0),