Skip to content
Snippets Groups Projects
Commit 237c8be6 authored by Joshua Colp's avatar Joshua Colp
Browse files

Merged revisions 48038 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48038 | file | 2006-11-27 10:32:19 -0500 (Mon, 27 Nov 2006) | 10 lines

Merged revisions 48037 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48037 | file | 2006-11-27 10:30:37 -0500 (Mon, 27 Nov 2006) | 2 lines

Do not reference the freed outgoing structure in the debug message. (issue #8425 reported by arkadia)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 1b372d1b
Branches
Tags
No related merge requests found
...@@ -387,8 +387,8 @@ static int scan_service(char *fn, time_t now, time_t atime) ...@@ -387,8 +387,8 @@ static int scan_service(char *fn, time_t now, time_t atime)
now += o->retrytime; 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");
free_outgoing(o);
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_outgoing(o);
} else { } else {
/* Increment retries */ /* Increment retries */
o->retries++; o->retries++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment