diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-05-29 21:59:21 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-05-29 21:59:21 +0000 |
| commit | 2baca1b2c5ebac54528455e207f4f92ddbcfc4aa (patch) | |
| tree | d6e77e8a40c6f36fa9bb3dce3263fe475d96a063 /funcs | |
| parent | 1e9c6c4a70b626b9d8f1a5cf7b4d4bbb9dff0fb9 (diff) | |
Merged revisions 66538 via svnmerge from
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
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index f47e45db6..451c7b1f8 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -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; } |