aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_queue.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index cc4a5fa91..fbdab1bab 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -638,7 +638,7 @@ static struct {
static void *device_state_thread(void *data)
{
- struct statechange *sc;
+ struct statechange *sc = NULL;
while (!device_state.stop) {
ast_mutex_lock(&device_state.lock);
@@ -650,7 +650,7 @@ static void *device_state_thread(void *data)
/* Check to see if we were woken up to see the request to stop */
if (device_state.stop)
- return NULL;
+ break;
if (!sc)
continue;
@@ -658,8 +658,15 @@ static void *device_state_thread(void *data)
handle_statechange(sc);
free(sc);
+ sc = NULL;
}
+ if (sc)
+ free(sc);
+
+ while ((sc = AST_LIST_REMOVE_HEAD(&device_state.state_change_q, entry)))
+ free(sc);
+
return NULL;
}