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

main: Don't rescan main loop events if not initialized

Browse Source 
This is done because it makes our life easier with unit tests. Also, a rescan
on an uninitialized event list will result in a stacktrace.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-04-27 11:14:33 -04:00
parent 3a47dfed34
commit 3ab017b10c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/main.c
View File

@ -1553,6 +1553,13 @@ rescan_periodic_events(const or_options_t *options)
{ {
tor_assert(options); tor_assert(options);
/* Avoid scanning the event list if we haven't initialized it yet. This is
* particularly useful for unit tests in order to avoid initializing main
* loop events everytime. */
if (!periodic_events_initialized) {
return;
}
int roles = get_my_roles(options); int roles = get_my_roles(options);
for (int i = 0; periodic_events[i].name; ++i) { for (int i = 0; periodic_events[i].name; ++i) {