Fix truth of strings

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6817 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 15 insertions, 1 deletions

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)