From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 16 Dec 2008 21:12:49 +0000 (+0000)
Subject: Merged revisions 164876 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~582
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf502aa246db616db9afc72e22e75405e6fd6a11;p=thirdparty%2Fasterisk.git

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

........


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

diff --git a/apps/app_macro.c b/apps/app_macro.c
index ce65bef25d..6d9b412f92 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -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);