From a6a17f1789bc6ced3b78c583fed3b29194a52370 Mon Sep 17 00:00:00 2001 From: BJ Weschke Date: Tue, 30 May 2006 14:55:16 +0000 Subject: [PATCH] Fix infinite loop scenario and add some sanity checking to prevent segfault on a NULL parameter coming in (which probably shouldn't happen, but just to be safe...) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@30770 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/app_queue.c b/apps/app_queue.c index 5e41b990de..53929b309d 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -622,6 +622,9 @@ static int add_to_interfaces(char *interface) { struct ast_member_interfaces *curint, *newint; + if (!interface) + return 0; + AST_LIST_LOCK(&interfaces); AST_LIST_TRAVERSE(&interfaces, curint, list) { if (!strcasecmp(curint->interface, interface)) @@ -649,6 +652,9 @@ static int interface_exists_global(char *interface) struct member *mem; int ret = 0; + if (!interface) + return ret; + ast_mutex_lock(&qlock); for (q = queues; q && !ret; q = q->next) { ast_mutex_lock(&q->lock); @@ -658,6 +664,7 @@ static int interface_exists_global(char *interface) ret = 1; break; } + mem = mem->next; } ast_mutex_unlock(&q->lock); } @@ -671,6 +678,9 @@ static int remove_from_interfaces(char *interface) { struct ast_member_interfaces *curint; + if (!interface) + return 0; + AST_LIST_LOCK(&interfaces); AST_LIST_TRAVERSE_SAFE_BEGIN(&interfaces, curint, list) { if (!strcasecmp(curint->interface, interface) && !interface_exists_global(interface)) {