From b5f0647fc87a7c420e6154955fb160917fb3b197 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 1 May 2012 23:11:22 +0000 Subject: Fix Coverity-reported ARRAY_VS_SINGLETON error. As it turned out, this wasn't a huge deal. We were calling ast_app_parse_options() for a set of options of which none took arguments. The proper thing to do for this case is to pass NULL for the "args" parameter here. We were instead passing a seemingly-randomly chosen char * from the function. While this would never get written to, you can rest assured things would have gotten bad had new options (which took arguments) been added to func_volume. (closes issue ASTERISK-19656) ........ Merged revisions 364899 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 364900 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@364901 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/funcs/func_volume.c b/funcs/func_volume.c index 806564bee..39b5a8a08 100644 --- a/funcs/func_volume.c +++ b/funcs/func_volume.c @@ -206,7 +206,7 @@ static int volume_write(struct ast_channel *chan, const char *cmd, char *data, c if (!ast_strlen_zero(args.options)) { struct ast_flags flags = { 0 }; - ast_app_parse_options(volume_opts, &flags, &data, args.options); + ast_app_parse_options(volume_opts, &flags, NULL, args.options); vi->flags = flags.flags; } else { vi->flags = 0; -- cgit v1.2.3