commit 357e26a64532da7196805f68885542c793d362e3
author Ytai Ben-Tsvi <ytai@google.com> Tue Jan 05 13:21:19 2021 -0800
committer Ytai Ben-Tsvi <ytai@google.com> Tue Jan 05 14:43:24 2021 -0800
tree e0a9c1d4399d1301a1c87c5468f009f5451eb064
parent 1ab91b43ec864237e3bd12929669420b55c25bf6

Ignore response in case of failure

When the status indicates failure, the output should be ignored.
Otherwise, conversion may fail and crash.

Fixes: 175840225
Test: CTS audio tests
Change-Id: I2200b720d98714b44e9ad50ebc06e2c07de0289c

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index 1b1e143..d4cbbc3 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -1609,9 +1609,11 @@
 
     media::CreateTrackResponse response;
     status = audioFlinger->createTrack(VALUE_OR_FATAL(input.toAidl()), response);
-    IAudioFlinger::CreateTrackOutput output = VALUE_OR_FATAL(
-            IAudioFlinger::CreateTrackOutput::fromAidl(
-                    response));
+
+    IAudioFlinger::CreateTrackOutput output{};
+    if (status == NO_ERROR) {
+        output = VALUE_OR_FATAL(IAudioFlinger::CreateTrackOutput::fromAidl(response));
+    }
 
     if (status != NO_ERROR || output.outputId == AUDIO_IO_HANDLE_NONE) {
         ALOGE("%s(%d): AudioFlinger could not create track, status: %d output %d",