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
1.0
Russell Bryant 20 years ago
parent 168ed954eb
commit 9ce061aa3f

@ -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);

Loading…
Cancel
Save