diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-16 19:52:39 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-16 19:52:39 +0000 |
| commit | 6ea74d9fcdea46f8330860b53cbe40708eef9634 (patch) | |
| tree | 3284379121bee920e96b7192677f2d7ec23ba377 | |
| parent | 53bec0c092e7b2d4cb017e988cc6eb11f80a92ad (diff) | |
Don't stop printing cdr variables if we encounter one with a blank name or value.
(closes issue #17900)
Reported by: under
Patches:
core-show-channel-cdr-fix1.diff uploaded by mnicholson (license 96)
Tested by: mnicholson
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@287114 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/cdr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/main/cdr.c b/main/cdr.c index 7868c1a64..c128d35bb 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -368,7 +368,7 @@ int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr) int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, char delim, char sep, int recur) { struct ast_var_t *variables; - const char *var, *val; + const char *var; char *tmp; char workspace[256]; int total = 0, x = 0, i; @@ -380,16 +380,16 @@ int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, cha ast_build_string(&buf, &size, "\n"); AST_LIST_TRAVERSE(&cdr->varshead, variables, entries) { - if (variables && - (var = ast_var_name(variables)) && (val = ast_var_value(variables)) && - !ast_strlen_zero(var) && !ast_strlen_zero(val)) { - if (ast_build_string(&buf, &size, "level %d: %s%c%s%c", x, var, delim, val, sep)) { - ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n"); - break; - } else - total++; - } else + if (!(var = ast_var_name(variables))) { + continue; + } + + if (ast_build_string(&buf, &size, "level %d: %s%c%s%c", x, var, delim, S_OR(ast_var_value(variables), ""), sep)) { + ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n"); break; + } + + total++; } for (i = 0; cdr_readonly_vars[i]; i++) { |