tor

commit 04e9e74f1dd4fad7fe9e072253dd51b9c03bebf2
parent 5dbdca011454d1d6c9e83bcc1a970ec3c4f368da
Author: teor <teor@torproject.org>
Date:   Mon, 21 Oct 2019 13:07:39 +1000

Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2

Diffstat:
A
changes/ticket32058
 | 
5
+++++
M
src/core/mainloop/periodic.c
 | 
5
+++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/changes/ticket32058 b/changes/ticket32058
@@ -0,0 +1,5 @@
+  o Minor bugfixes (mainloop, periodic events):
+    - Periodic events enabled flag was not unset properly when shutting down tor
+      cleanly. This had the side effect to not re-enable periodic events when
+      tor_api.h is used to relaunch tor after a shutdown. Fixes bug 32058;
+      bugfix on 0.3.3.1-alpha.
diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c
@@ -153,6 +153,11 @@ periodic_event_disconnect(periodic_event_item_t *event)
 {
   if (!event)
     return;
+
+  /* First disable the event so we first cancel the event and set its enabled
+   * flag properly. */
+  periodic_event_disable(event);
+
   mainloop_event_free(event->ev);
   event->last_action_time = 0;
 }