diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-22 03:18:10 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-22 03:18:10 +0000 |
| commit | 0221f8593d0399119c21822a087d113dc998fad9 (patch) | |
| tree | f8c40aa98c2ac8b112f3a0b8de6e455323e22887 /apps/app_forkcdr.c | |
| parent | 2f1ed263e535df9e0d4f02b544952ff5f4eb178f (diff) | |
Merged revisions 124541 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r124541 | murf | 2008-06-21 20:58:06 -0600 (Sat, 21 Jun 2008) | 17 lines
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/branches/1.6.0@124542 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); |