From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 14 Jan 2006 19:08:03 +0000 (+0000)
Subject: Merged revisions 8074 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2936
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3578c5b19d9108116577c76ad7605a75db1bc57d;p=thirdparty%2Fasterisk.git

Merged revisions 8074 via svnmerge from
/branches/1.2


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

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index bce5d9d625..414adf36b6 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -50,8 +50,12 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
 	if (delim) {
 		varname = strsep(&delim, "|");
 		pbx_retrieve_variable(chan, varname, &varval, workspace, sizeof(workspace), NULL);
-		while (strsep(&varval, delim))
-			fieldcount++;
+		if (delim) {
+			while (strsep(&varval, delim))
+				fieldcount++;
+		} else if (!ast_strlen_zero(varval)) {
+			fieldcount = 1;
+		}
 		snprintf(buf, len, "%d", fieldcount);
 	} else {
 		ast_log(LOG_ERROR, "Out of memory\n");