kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 04:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 146875 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r146875 | jpeeler | 2008-10-06 17:03:01 -0500 (Mon, 06 Oct 2008) | 5 lines

Explicitly set args in park_call_exec NULL so in the case of no options being passed in, there
 is no garbage attempted to be used. Also, do not set args to unknown value again if there are
 no options passed in.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@146876 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2008-10-06 22:04:23 +00:00
parent a22f5b3bf0
commit 2917e91db4
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/features.c
View File

@@ -2773,24 +2773,32 @@ static int park_call_exec(struct ast_channel *chan, void *data)
if (!res) {
struct ast_park_call_args args = {
.orig_chan_name = orig_chan_name,
.extout = NULL,
.return_con = NULL,
.return_ext = NULL,
};
struct ast_flags flags = { 0 };
if (parse && !ast_strlen_zero(app_args.timeout)) {
if (parse) {
if (!ast_strlen_zero(app_args.timeout)) {
if (sscanf(app_args.timeout, "%d", &args.timeout) != 1) {
ast_log(LOG_WARNING, "Invalid timeout '%s' provided\n", app_args.timeout);
args.timeout = 0;
}
}
if (!ast_strlen_zero(app_args.return_con)) {
args.return_con = app_args.return_con;
}
if (!ast_strlen_zero(app_args.return_ext)) {
args.return_ext = app_args.return_ext;
if (parse && !ast_strlen_zero(app_args.return_pri)) {
}
if (!ast_strlen_zero(app_args.return_pri)) {
if (sscanf(app_args.return_pri, "%d", &args.return_pri) != 1) {
ast_log(LOG_WARNING, "Invalid priority '%s' specified\n", app_args.return_pri);
args.return_pri = 0;
}
}
}
ast_app_parse_options(park_call_options, &flags, NULL, app_args.options);
args.flags = flags.flags;