Merged revisions 164876 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 16 Dec 2008 21:12:49 +0000 (21:12 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 16 Dec 2008 21:12:49 +0000 (21:12 +0000)
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.)

........

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

apps/app_macro.c

index ce65bef..6d9b412 100644 (file)
@@ -370,8 +370,8 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
                        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);