event/TimeoutMonitor: eliminate support for periodic events

No caller needs this.  Fixes use-after-free after returning from
Client::OnTimeout().

1 files changed, 5 insertions, 9 deletions

diff --git a/src/event/TimeoutMonitor.cxx b/src/event/TimeoutMonitor.cxx
index e0bf997a0..8636292ac 100644
--- a/src/event/TimeoutMonitor.cxx
+++ b/src/event/TimeoutMonitor.cxx
@@ -45,21 +45,17 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
 	source = loop.AddTimeoutSeconds(s, Callback, this);
 }
 
-bool
+void
 TimeoutMonitor::Run()
 {
-	bool result = OnTimeout();
-	if (!result && source != nullptr) {
-		g_source_unref(source);
-		source = nullptr;
-	}
-
-	return result;
+	Cancel();
+	OnTimeout();
 }
 
 gboolean
 TimeoutMonitor::Callback(gpointer data)
 {
 	TimeoutMonitor &monitor = *(TimeoutMonitor *)data;
-	return monitor.Run();
+	monitor.Run();
+	return false;
 }