diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-22 02:58:06 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-22 02:58:06 +0000 |
| commit | 06213c104b69b08ca2e5c90cac258c6694cf4dd2 (patch) | |
| tree | 7edf6ec4f70b6fb508dee110790460c65f35f4db /apps/app_forkcdr.c | |
| parent | ded3c0711728a736c1fd62b99a0c0f470598c882 (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: http://svn.digium.com/svn/asterisk/trunk@124541 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_forkcdr.c')
| -rw-r--r-- | apps/app_forkcdr.c | 6 |
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); |