[asterisk-commits] jpeeler: branch 1.6.1 r159403 - in /branches/1.6.1: ./ main/features.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Nov 25 21:19:50 CST 2008


Author: jpeeler
Date: Tue Nov 25 21:19:50 2008
New Revision: 159403

URL: http://svn.digium.com/view/asterisk?view=rev&rev=159403
Log:
Merged revisions 159402 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r159402 | jpeeler | 2008-11-25 21:18:01 -0600 (Tue, 25 Nov 2008) | 3 lines

Always parse arguments in park_call_exec so that app_args is valid. This prevents a crash when executing Park from the dialplan with no arguments.


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=159403&r1=159402&r2=159403
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Tue Nov 25 21:19:50 2008
@@ -2825,10 +2825,8 @@
 		AST_APP_ARG(options);
 	);
 
-	if (!ast_strlen_zero(data)) {
-		parse = ast_strdupa(data);
-		AST_STANDARD_APP_ARGS(app_args, parse);
-	}
+	parse = ast_strdupa(data);
+	AST_STANDARD_APP_ARGS(app_args, parse);
 
 	ast_copy_string(orig_exten, chan->exten, sizeof(orig_exten));
 




More information about the asterisk-commits mailing list