From: Steve Murphy <murf@digium.com>
Date: Sun, 22 Jun 2008 02:54:52 +0000 (+0000)
Subject: (closes issue #12910)
X-Git-Tag: 1.4.22-rc1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8f8c021d2b1c56d01084960d8372e44e5c197bd;p=thirdparty%2Fasterisk.git

(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/branches/1.4@124540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index f8ab05f3fa..dc53ef78bd 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -234,10 +234,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);