From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 7 Dec 2007 02:21:07 +0000 (+0000)
Subject: Merged revisions 91675 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~508
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=135f315382cbbc23636d2eed09fcd6f4bca3ca8f;p=thirdparty%2Fasterisk.git

Merged revisions 91675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r91675 | russell | 2007-12-06 20:19:45 -0600 (Thu, 06 Dec 2007) | 7 lines

Fix in an issue in the call forwarding handling code that was causing crashes
on every call into a queue.  I'm not entirely sure about the logic in this part
of the code, so I want to look at it some more tomorrow.  However, this makes
it safe and keeps it from crashing.

(closes issue #11486, reported by adamg, patched by me)

........


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 531297025b..eb652747d1 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2852,8 +2852,9 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 			strcpy(di->interface, cur->interface);
 			AST_LIST_INSERT_TAIL(dialed_interfaces, di, list);
 		} else {
+			if (di)
+				ast_log(LOG_DEBUG, "Skipping dialing interface '%s' since it has already been dialed\n", di->interface);
 			AST_LIST_UNLOCK(dialed_interfaces);
-			ast_log(LOG_DEBUG, "Skipping dialing interface '%s' since it has already been dialed\n", di->interface);
 			free(tmp);
 			continue;
 		}