瀏覽代碼

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

teor 4 年之前
父節點
當前提交
400cee261e
共有 2 個文件被更改,包括 10 次插入0 次删除
  1. 5 0
      changes/ticket32058
  2. 5 0
      src/core/mainloop/periodic.c

+ 5 - 0
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.

+ 5 - 0
src/core/mainloop/periodic.c

@@ -137,6 +137,11 @@ periodic_event_destroy(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;
 }