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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@124542 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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);