From 6b0ad4ad0a55784cf6595423bb12bf0c0dfff4df Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 9 Jan 2006 20:08:24 +0000
Subject: Bug 6157 - Memory leak

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7908 f38db490-d61c-443f-a65b-d21fe96a405b
---
 pbx/pbx_spool.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pbx')

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 244f7b2f5..a7dbed32c 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -313,8 +313,10 @@ static int scan_service(char *fn, time_t now, time_t atime)
 #endif
 				fclose(f);
 				if (o->retries <= o->maxretries) {
+					now += o->retrytime;
 					if (o->callingpid && (o->callingpid == ast_mainpid)) {
 						safe_append(o, time(NULL), "DelayedRetry");
+						free_outgoing(o);
 						ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn);
 					} else {
 						/* Increment retries */
@@ -327,7 +329,6 @@ static int scan_service(char *fn, time_t now, time_t atime)
 						safe_append(o, now, "StartRetry");
 						launch_service(o);
 					}
-					now += o->retrytime;
 					return now;
 				} else {
 					ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : "");
-- 
cgit v1.2.3