automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@66584 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 00b6dd1720fc7c9b7a08f50fba97eff3b82e45da..0aaf3fc4b0c53cf7624a596370d3d821fa031eef 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -51,7 +51,9 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
 
                sprintf(varsubst, "${%s}", varname);
                pbx_substitute_variables_helper(chan, varsubst, varval, sizeof(varval) - 1);
-               if (delim) {
+               if (ast_strlen_zero(varval))
+                       fieldcount = 0;
+               else if (delim) {
                        while (strsep(&varval2, delim))
                                fieldcount++;
                } else if (!ast_strlen_zero(varval)) {
@@ -60,7 +62,7 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
                snprintf(buf, len, "%d", fieldcount);
        } else {
                ast_log(LOG_ERROR, "Out of memory\n");
-               strncpy(buf, "1", len);
+               ast_copy_string(buf, "1", len);
        }
        return buf;
 }