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

Merge branch 'maint-0.4.0'

Browse Source
This commit is contained in:
George Kadianakis 2019-04-09 12:25:18 +03:00
commit 16041d7918
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug29922 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (testing, windows):
- Fix a test failure caused by an unexpected bug warning in
our test for tor_gmtime_r(-1). Fixes bug 29922;
bugfix on 0.2.9.3-alpha.

9
src/test/test_util.c
View File

@ -728,6 +728,13 @@ test_util_time(void *arg)
#define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \
CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm")
#define CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(msg) \
do { \
if (mock_saved_log_n_entries()) { \
expect_single_log_msg_containing("Out-of-range argument");\
} \
teardown_capture_of_logs(); \
} while (0)
/* year */ /* year */
@ -914,7 +921,9 @@ test_util_time(void *arg)
* depending on whether the implementation of the system gmtime(_r) * depending on whether the implementation of the system gmtime(_r)
* sets struct tm (1) or not (1970) */ * sets struct tm (1) or not (1970) */
t_res = -1; t_res = -1;
CAPTURE();
tor_gmtime_r(&t_res, &b_time); tor_gmtime_r(&t_res, &b_time);
CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE();
tt_assert(b_time.tm_year == (1970-1900) || tt_assert(b_time.tm_year == (1970-1900) ||
b_time.tm_year == (1969-1900)); b_time.tm_year == (1969-1900));