From: Joshua Colp <jcolp@digium.com>
Date: Mon, 27 Nov 2006 15:33:56 +0000 (+0000)
Subject: Merged revisions 48038 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3864
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=237c8be66cc429cc2c199a0772a301d132049c28;p=thirdparty%2Fasterisk.git

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
---

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index d9b0eac6a4..2293ca9ab7 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -387,8 +387,8 @@ static int scan_service(char *fn, time_t now, time_t atime)
 					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);
+						free_outgoing(o);
 					} else {
 						/* Increment retries */
 						o->retries++;