app_queue: Add NULL pointer checks in app_queue

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 1aef40e85d0b1c2a19a7b8c667323fc7090818f9..529f2bf4d7ab47df3450cc833868f136dc8e9a2c 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -6745,7 +6745,15 @@ static void handle_local_optimization_begin(void *userdata, struct stasis_subscr
        struct local_optimization *optimization;
        unsigned int id;
        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) {
                return;
        }
@@ -10594,7 +10602,7 @@ static char *complete_queue(const char *line, const char *word, int pos, int sta
        queue_iter = ao2_iterator_init(queues, 0);
        while ((q = ao2_t_iterator_next(&queue_iter, "Iterate through queues"))) {
                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);
                        queue_t_unref(q, "Done with iterator");
                        break;