[svn-commits] russell: branch 1.6.0 r164878 - in /branches/1.6.0: ./ apps/app_macro.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec 16 15:13:18 2008
New Revision: 164878

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164878
Log:
Merged revisions 164877 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r164877 | russell | 2008-12-16 15:12:49 -0600 (Tue, 16 Dec 2008) | 14 lines

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

........
r164876 | russell | 2008-12-16 15:10:44 -0600 (Tue, 16 Dec 2008) | 6 lines

Do not dereference the channel if AST_PBX_KEEPALIVE has been returned.

This is a bug I noticed while looking at the code for app_macro.  This return code
means that another thread has assumed ownership of the channel and it can no longer
be touched.  (I hate this return code with a passion, by the way.)

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_macro.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_macro.c?view=diff&rev=164878&r1=164877&r2=164878
==============================================================================
--- branches/1.6.0/apps/app_macro.c (original)
+++ branches/1.6.0/apps/app_macro.c Tue Dec 16 15:13:18 2008
@@ -307,8 +307,8 @@
 			case AST_PBX_KEEPALIVE:
 				ast_debug(2, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
 				ast_verb(2, "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
+				dead = 1;
 				goto out;
-				break;
 			default:
 				ast_debug(2, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
 				ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);