diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-08-24 19:53:43 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-08-24 19:53:43 +0000 |
| commit | 1ff5a0988d09edb965b5ebc1008a7805e68ff0f6 (patch) | |
| tree | bfc67c2cf6b6170a2055dfe0b6a1e815f1803cdf /main/pbx.c | |
| parent | 9df34a3d4065135fa6ff94e6dbb3281bfc434a09 (diff) | |
Merged revisions 40994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r40994 | russell | 2006-08-24 15:41:26 -0400 (Thu, 24 Aug 2006) | 11 lines
Fix a few issues related to the handling of channel variables
- in pbx_builtin_serialize_variables(), the variable list traversal would stop
on a variables with empty name/values, which is not appropriate
- When removing the GROUP variables, use AST_LIST_REMOVE_CURRENT instead of
AST_LIST_REMOVE
- During masquerading, when copying the variables list from one channel to the
other, using AST_LIST_INSERT_TAIL is not valid for appending a whole list.
It leaves the tail pointer of the list invalid. Introduce a new macro,
AST_LIST_APPEND_LIST that appends a list properly.
(issue #7802, softins)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/pbx.c b/main/pbx.c index feae6d16d..31f554acd 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5360,9 +5360,9 @@ int pbx_builtin_serialize_variables(struct ast_channel *chan, char *buf, size_t memset(buf, 0, size); AST_LIST_TRAVERSE(&chan->varshead, variables, entries) { - if(variables && - (var=ast_var_name(variables)) && (val=ast_var_value(variables)) && - !ast_strlen_zero(var) && !ast_strlen_zero(val)) { + if ((var=ast_var_name(variables)) && (val=ast_var_value(variables)) + /* && !ast_strlen_zero(var) && !ast_strlen_zero(val) */ + ) { if (ast_build_string(&buf, &size, "%s=%s\n", var, val)) { ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n"); break; |