From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 9 Jan 2006 22:03:42 +0000 (+0000)
Subject: fix memory leak with DelayedRetry (issue #6157)
X-Git-Tag: 1.0.11.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce061aa3f25171f2ae1cec005ad5c27611416c1;p=thirdparty%2Fasterisk.git

fix memory leak with DelayedRetry (issue #6157)


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

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index fcf50c2711..b8b06ed8f8 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -271,9 +271,11 @@ 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");
 						ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn);
+						free(o);
 					} else {
 						/* Increment retries */
 						o->retries++;
@@ -285,7 +287,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);