kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak with DelayedRetry (issue #6157)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.0@7914 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-01-09 22:03:42 +00:00
parent 168ed954eb
commit 9ce061aa3f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pbx/pbx_spool.c
View File

@@ -271,9 +271,11 @@ static int scan_service(char *fn, time_t now, time_t atime)
#endif #endif
fclose(f); fclose(f);
if (o->retries <= o->maxretries) { if (o->retries <= o->maxretries) {
now += o->retrytime;
if (o->callingpid && (o->callingpid == ast_mainpid)) { if (o->callingpid && (o->callingpid == ast_mainpid)) {
safe_append(o, time(NULL), "DelayedRetry"); safe_append(o, time(NULL), "DelayedRetry");
ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn); ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn);
free(o);
} else { } else {
/* Increment retries */ /* Increment retries */
o->retries++; o->retries++;
@@ -285,7 +287,6 @@ static int scan_service(char *fn, time_t now, time_t atime)
safe_append(o, now, "StartRetry"); safe_append(o, now, "StartRetry");
launch_service(o); launch_service(o);
} }
now += o->retrytime;
return now; return now;
} else { } 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); ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt(s)\n", o->tech, o->dest, o->retries - 1);