summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorSteve Murphy <murf@digium.com>2008-06-22 02:58:06 +0000
committerSteve Murphy <murf@digium.com>2008-06-22 02:58:06 +0000
commitd68b137c3d2563f3043f4feb04ba11263685a450 (patch)
tree7edf6ec4f70b6fb508dee110790460c65f35f4db /apps
parent066020761429956b1252f7b1e2c94c040e020036 (diff)
Merged revisions 124540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124540 | murf | 2008-06-21 20:54:52 -0600 (Sat, 21 Jun 2008) | 9 lines (closes issue #12910) Reported by: chris-mac Sorry, my testing did not contain the simple case of forkCDR(v), I am much embarrassed to admit. If I had, I would have more solidly initialized the opts element for varset. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@124541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_forkcdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index c14564be3..b92e3de32 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -225,10 +225,10 @@ static int forkcdr_exec(struct ast_channel *chan, void *data)
AST_STANDARD_APP_ARGS(arglist, argcopy);
- if (!ast_strlen_zero(arglist.options)) {
+ opts[OPT_ARG_VARSET] = 0;
+
+ if (!ast_strlen_zero(arglist.options))
ast_app_parse_options(forkcdr_exec_options, &flags, opts, arglist.options);
- } else
- opts[OPT_ARG_VARSET] = 0;
if (!ast_strlen_zero(data))
ast_set2_flag(chan->cdr, ast_test_flag(&flags, OPT_KEEPVARS), AST_CDR_FLAG_KEEP_VARS);