From 68c2c01b1ca70e63ca3d6c4e1639af1a33ecdcea Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Tue, 18 Oct 2005 16:51:28 +0000 Subject: Fix truth of strings git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6817 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pbx.c b/pbx.c index 51b337018..d8747d572 100755 --- a/pbx.c +++ b/pbx.c @@ -6029,7 +6029,21 @@ void pbx_builtin_clear_globals(void) static int pbx_checkcondition(char *condition) { - return condition ? atoi(condition) : 0; + if (condition) { + if (*condition == '\0') { + /* Empty strings are false */ + return 0; + } else if (*condition >= '0' && *condition <= '9') { + /* Numbers are evaluated for truth */ + return atoi(condition); + } else { + /* Strings are true */ + return 1; + } + } else { + /* NULL is also false */ + return 0; + } } static int pbx_builtin_gotoif(struct ast_channel *chan, void *data) -- cgit v1.2.3