mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 18:58:22 +00:00
resource_channels.c: Don't call ast_channel_get_by_name on empty optional arguments
`ast_ari_channels_create` and `ast_ari_channels_dial` called the
`ast_channel_get_by_name` function with optional arguments. Since
8f1982c4d6
, this function logs an error for empty channel names.
This commit adds checks for empty optional arguments that are used
to call `ast_channel_get_by_name` to prevent these error logs.
This commit is contained in:
@@ -1790,7 +1790,7 @@ void ast_ari_channels_create(struct ast_variable *headers,
|
|||||||
char *stuff;
|
char *stuff;
|
||||||
int cause;
|
int cause;
|
||||||
struct ast_format_cap *request_cap;
|
struct ast_format_cap *request_cap;
|
||||||
struct ast_channel *originator;
|
struct ast_channel *originator = NULL;
|
||||||
|
|
||||||
/* Parse any query parameters out of the body parameter */
|
/* Parse any query parameters out of the body parameter */
|
||||||
if (args->variables) {
|
if (args->variables) {
|
||||||
@@ -1850,7 +1850,10 @@ void ast_ari_channels_create(struct ast_variable *headers,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
originator = ast_channel_get_by_name(args->originator);
|
if (!ast_strlen_zero(args->originator)) {
|
||||||
|
originator = ast_channel_get_by_name(args->originator);
|
||||||
|
}
|
||||||
|
|
||||||
if (originator) {
|
if (originator) {
|
||||||
request_cap = ao2_bump(ast_channel_nativeformats(originator));
|
request_cap = ao2_bump(ast_channel_nativeformats(originator));
|
||||||
if (!ast_strlen_zero(args->app)) {
|
if (!ast_strlen_zero(args->app)) {
|
||||||
@@ -1952,7 +1955,9 @@ void ast_ari_channels_dial(struct ast_variable *headers,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
caller = ast_channel_get_by_name(args->caller);
|
if (!ast_strlen_zero(args->caller)) {
|
||||||
|
caller = ast_channel_get_by_name(args->caller);
|
||||||
|
}
|
||||||
|
|
||||||
callee = ast_channel_get_by_name(args->channel_id);
|
callee = ast_channel_get_by_name(args->channel_id);
|
||||||
if (!callee) {
|
if (!callee) {
|
||||||
|
Reference in New Issue
Block a user