Fix memleak in TorController [rework]

laanwj · MarcoFalke · commit 66d540855982 · 2016-04-27T22:34:48.000+02:00
It looks like, TorController::disconnected_cb(TorControlConnection& conn) gets called multiple times which results in multiple event_new(). Avoid this by creating the event only once in the constructore, and deleting it only once in the destructor (thanks to Cory Fields for the idea). Replaces the fix by Jonas Schnelli in #7610, see discussion there. Github-Pull: #7637 Rebased-From: e219503
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
@@ -394,6 +394,9 @@ TorController::TorController(struct event_base* base, const std::string& target)
     target(target), conn(base), reconnect(true), reconnect_ev(0),
     reconnect_timeout(RECONNECT_TIMEOUT_START)
 {
+    reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
+    if (!reconnect_ev)
+        LogPrintf("tor: Failed to create event for reconnection: out of memory?\n");
     // Start connection attempts immediately
     if (!conn.Connect(target, boost::bind(&TorController::connected_cb, this, _1),
          boost::bind(&TorController::disconnected_cb, this, _1) )) {
@@ -409,8 +412,10 @@ TorController::TorController(struct event_base* base, const std::string& target)
 
 TorController::~TorController()
 {
-    if (reconnect_ev)
-        event_del(reconnect_ev);
+    if (reconnect_ev) {
+        event_free(reconnect_ev);
+        reconnect_ev = 0;
+    }
     if (service.IsValid()) {
         RemoveLocal(service);
     }
@@ -622,8 +627,8 @@ void TorController::disconnected_cb(TorControlConnection& conn)
 
     // Single-shot timer for reconnect. Use exponential backoff.
     struct timeval time = MillisToTimeval(int64_t(reconnect_timeout * 1000.0));
-    reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
-    event_add(reconnect_ev, &time);
+    if (reconnect_ev)
+        event_add(reconnect_ev, &time);
     reconnect_timeout *= RECONNECT_TIMEOUT_EXP;
 }
 
