Fix crash in AudioThread::setActive

If AudioThread::run() hasn't been called yet, we can dereference a null inputQueue
cjcliffe · Oct 7, 2015 · 0b10a5b · 0b10a5b
1 parent 2a95d05
commit 0b10a5b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp
@@ -428,7 +428,7 @@ bool AudioThread::isActive() {
 void AudioThread::setActive(bool state) {
 
     AudioThreadInput *dummy;
-    if (state && !active) {
+    if (state && !active && inputQueue) {
         while (!inputQueue->empty()) {  // flush queue
             inputQueue->pop(dummy);
             if (dummy) {
@@ -438,10 +438,12 @@ void AudioThread::setActive(bool state) {
         deviceController[parameters.deviceId]->bindThread(this);
     } else if (!state && active) {
         deviceController[parameters.deviceId]->removeThread(this);
-        while (!inputQueue->empty()) {  // flush queue
-            inputQueue->pop(dummy);
-            if (dummy) {
-                dummy->decRefCount();
+        if(inputQueue) {
+            while (!inputQueue->empty()) {  // flush queue
+                inputQueue->pop(dummy);
+                if (dummy) {
+                    dummy->decRefCount();
+                }
             }
         }
     }