[svn-commits] russell: trunk r91676 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Dec  6 20:21:07 2007
New Revision: 91676

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91676
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=91676&r1=91675&r2=91676
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Dec  6 20:21:07 2007
@@ -2852,8 +2852,9 @@
 			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;
 		}