From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 15 May 2005 23:26:29 +0000 (+0000)
Subject: protect ResponseTimeout and DigitTimeout apps from crashing when called in non-PBX... 
X-Git-Tag: 1.0.11.1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d62574ef35c18d26517ede69b41d9a2b8cf936;p=thirdparty%2Fasterisk.git

protect ResponseTimeout and DigitTimeout apps from crashing when called in non-PBX channels (bug #4092)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx.c b/pbx.c
index 0f962966d8..ded9be66d6 100755
--- a/pbx.c
+++ b/pbx.c
@@ -4619,6 +4619,10 @@ static int pbx_builtin_atimeout(struct ast_channel *chan, void *data)
 
 static int pbx_builtin_rtimeout(struct ast_channel *chan, void *data)
 {
+	/* If the channel is not in a PBX, return now */
+	if (!chan->pbx)
+		return 0;
+
 	/* Set the timeout for how long to wait between digits */
 	chan->pbx->rtimeout = atoi((char *)data);
 	if (option_verbose > 2)
@@ -4628,6 +4632,10 @@ static int pbx_builtin_rtimeout(struct ast_channel *chan, void *data)
 
 static int pbx_builtin_dtimeout(struct ast_channel *chan, void *data)
 {
+	/* If the channel is not in a PBX, return now */
+	if (!chan->pbx)
+		return 0;
+
 	/* Set the timeout for how long to wait between digits */
 	chan->pbx->dtimeout = atoi((char *)data);
 	if (option_verbose > 2)