[svn-commits] murf: branch 1.4 r124540 - /branches/1.4/apps/app_forkcdr.c

[SVN commits to the Digium repositories]

Author: murf
Date: Sat Jun 21 21:54:52 2008
New Revision: 124540

URL: http://svn.digium.com/view/asterisk?view=rev&rev=124540
Log:
(closes issue #12752)
Reported by: rossnick

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.



Modified:
    branches/1.4/apps/app_forkcdr.c

Modified: branches/1.4/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_forkcdr.c?view=diff&rev=124540&r1=124539&r2=124540
==============================================================================
--- branches/1.4/apps/app_forkcdr.c (original)
+++ branches/1.4/apps/app_forkcdr.c Sat Jun 21 21:54:52 2008
@@ -234,10 +234,10 @@
 
 	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);