commit 9db3bb488875575f1e405ba5bf69206db9d9e403
author Andy Hung <hunga@google.com> Wed Sep 19 14:05:11 2018 -0700
committer Andy Hung <hunga@google.com> Wed Sep 19 14:06:32 2018 -0700
tree b93608086f18e028e7a823ae0cb4f622c0b3878c
parent ffc04957ed8f9c42a3fb7481e8dc8cc90a8ed65c

AudioFlinger: Do not dereference null track

Test: compile (original bug occurred during sanity testing)
Bug: 116142034
Change-Id: I33d77bf1970dfdd96706ace8f858baf5d473a59f

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 6e65ac0..06975ac 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -746,7 +746,7 @@
         output.afFrameCount = thread->frameCount();
         output.afSampleRate = thread->sampleRate();
         output.afLatencyMs = thread->latency();
-        output.trackId = track->id();
+        output.trackId = track == nullptr ? -1 : track->id();
 
         // move effect chain to this output thread if an effect on same session was waiting
         // for a track to be created