Fix truth of strings

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

diff --git a/pbx.c b/pbx.c
index 51b3370..d8747d5 100755 (executable)
--- 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)