From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 2 Mar 2009 23:06:16 +0000 (+0000)
Subject: Fix a reference leak in timerfd_set_rate().
X-Git-Tag: 1.6.2.0-beta1~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6652e97608126cd4f87e29bc9bd12546dec76d4;p=thirdparty%2Fasterisk.git

Fix a reference leak in timerfd_set_rate().

(found during a debugging session with dvossel and mmichelson.)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@179465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index b1cbb04bdb..9688758f9c 100644
--- a/res/res_timing_timerfd.c
+++ b/res/res_timing_timerfd.c
@@ -134,6 +134,7 @@ static int timerfd_timer_set_rate(int handle, unsigned int rate)
 	struct timerfd_timer *our_timer, find_helper = {
 		.handle = handle,
 	};
+	int res;
 
 	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
 		ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
@@ -145,7 +146,11 @@ static int timerfd_timer_set_rate(int handle, unsigned int rate)
 	our_timer->saved_timer.it_interval.tv_sec = our_timer->saved_timer.it_value.tv_sec;
 	our_timer->saved_timer.it_interval.tv_nsec = our_timer->saved_timer.it_value.tv_nsec;
 
-	return timerfd_settime(handle, 0, &our_timer->saved_timer, NULL);
+	res = timerfd_settime(handle, 0, &our_timer->saved_timer, NULL);
+
+	ao2_ref(our_timer, -1);
+
+	return res;
 }
 
 static void timerfd_timer_ack(int handle, unsigned int quantity)