kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-07 13:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_queue: Add NULL pointer checks in app_queue

Browse Source 
Add NULL check for word_list before calling word_in_list()
Add NULL checks for channel snapshots from ast_multi_channel_blob_get_channel()

Resolves: #1425
This commit is contained in:
phoneben
2025-09-11 20:31:30 +03:00
committed by github-actions[bot]
parent 7b96fff129
commit af67321134
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_queue.c
View File

@@ -6701,7 +6701,15 @@ static void handle_local_optimization_begin(void *userdata, struct stasis_subscr
struct local_optimization *optimization; struct local_optimization *optimization;
unsigned int id; unsigned int id;
SCOPED_AO2LOCK(lock, queue_data); SCOPED_AO2LOCK(lock, queue_data);
if (!local_one || !local_two || !source) {
ast_debug(1, "Local optimization begin missing channel snapshots:%s%s%s\n",
!local_one ? " local_one," : "",
!local_two ? " local_two," : "",
!source ? " source," : "");
return;
}
if (queue_data->dying) { if (queue_data->dying) {
return; return;
} }
@@ -10500,7 +10508,7 @@ static char *complete_queue(const char *line, const char *word, int pos, int sta
queue_iter = ao2_iterator_init(queues, 0); queue_iter = ao2_iterator_init(queues, 0);
while ((q = ao2_t_iterator_next(&queue_iter, "Iterate through queues"))) { while ((q = ao2_t_iterator_next(&queue_iter, "Iterate through queues"))) {
if (!strncasecmp(word, q->name, wordlen) && ++which > state if (!strncasecmp(word, q->name, wordlen) && ++which > state
&& (!word_list_offset || !word_in_list(word_list, q->name))) { && (!word_list_offset || !word_list || !word_in_list(word_list, q->name))) {
ret = ast_strdup(q->name); ret = ast_strdup(q->name);
queue_t_unref(q, "Done with iterator"); queue_t_unref(q, "Done with iterator");
break; break;