From f3097eb1af0c3177b2b23ada6526dc4abd95438a Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 7 Aug 2008 19:59:00 +0000
Subject: [PATCH] Merged revisions 136635 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
r136635 | mmichelson | 2008-08-07 14:58:32 -0500 (Thu, 07 Aug 2008) | 5 lines

Don't allow Answer() to accept a negative argument.
Negative argument means an infinite delay and we
don't want that.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/pbx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/pbx.c b/main/pbx.c
index 7aea5d2a71..9d5741feb8 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7540,6 +7540,10 @@ static int pbx_builtin_answer(struct ast_channel *chan, void *data)
 	if ((chan->_state != AST_STATE_UP) && !ast_strlen_zero(data))
 		delay = atoi(data);
 
+	if (delay < 0) {
+		delay = 0;
+	}
+
 	return __ast_answer(chan, delay);
 }