Merged revisions 66538 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 29 May 2007 21:59:21 +0000 (21:59 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 29 May 2007 21:59:21 +0000 (21:59 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r66538 | tilghman | 2007-05-29 16:56:07 -0500 (Tue, 29 May 2007) | 10 lines

Merged revisions 66537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r66537 | tilghman | 2007-05-29 16:49:35 -0500 (Tue, 29 May 2007) | 2 lines

If the value of a variable passed to FIELDQTY is blank, then FIELDQTY should return 0, not 1.

........

................

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

funcs/func_strings.c

index f47e45d..451c7b1 100644 (file)
@@ -71,8 +71,12 @@ static int function_fieldqty(struct ast_channel *chan, const char *cmd,
 
                sprintf(varsubst, "${%s}", args.varname);
                pbx_substitute_variables_helper(chan, varsubst, varval, sizeof(varval) - 1);
-               while (strsep(&varval2, args.delim))
-                       fieldcount++;
+               if (ast_strlen_zero(varval2))
+                       fieldcount = 0;
+               else {
+                       while (strsep(&varval2, args.delim))
+                               fieldcount++;
+               }
        } else {
                fieldcount = 1;
        }