[svn-commits] mmichelson: branch 1.6.0 r136636 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Aug  7 14:59:00 2008
New Revision: 136636

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136636
Log:
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.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

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

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=136636&r1=136635&r2=136636
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Thu Aug  7 14:59:00 2008
@@ -7540,6 +7540,10 @@
 	if ((chan->_state != AST_STATE_UP) && !ast_strlen_zero(data))
 		delay = atoi(data);
 
+	if (delay < 0) {
+		delay = 0;
+	}
+
 	return __ast_answer(chan, delay);
 }