kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel: Short-circuit ast_channel_get_by_name() on empty arg.

Browse Source 
We know that passing a NULL or empty argument to
ast_channel_get_by_name() will never result in a matching channel and
will always result in an error being emitted, so just short-circuit
out in that case.

ASTERISK-28219 #close

Change-Id: I88eadc748e9c6996fc17467b0a05881bbfd00bce
This commit is contained in:
Sean Bright
2021-11-30 15:16:45 -05:00
committed by Kevin Harwell
parent 59fcd1e7e2
commit e9cac5f4bf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/channel.c
View File

@@ -1426,17 +1426,17 @@ struct ast_channel *ast_channel_get_by_name_prefix(const char *name, size_t name
struct ast_channel *chan; struct ast_channel *chan;
char *l_name = (char *) name; char *l_name = (char *) name;
if (ast_strlen_zero(l_name)) {
/* We didn't have a name to search for so quit. */
return NULL;
}
chan = ast_channel_callback(ast_channel_by_name_cb, l_name, &name_len, chan = ast_channel_callback(ast_channel_by_name_cb, l_name, &name_len,
(name_len == 0) /* optimize if it is a complete name match */ ? OBJ_KEY : 0); (name_len == 0) /* optimize if it is a complete name match */ ? OBJ_KEY : 0);
if (chan) { if (chan) {
return chan; return chan;
} }
if (ast_strlen_zero(l_name)) {
/* We didn't have a name to search for so quit. */
return NULL;
}
/* Now try a search for uniqueid. */ /* Now try a search for uniqueid. */
return ast_channel_callback(ast_channel_by_uniqueid_cb, l_name, &name_len, 0); return ast_channel_callback(ast_channel_by_uniqueid_cb, l_name, &name_len, 0);
} }