commit c778e59330a01a9aee6ad354c1e53462df4c88af
author Mikhail Naganov <mnaganov@google.com> Wed Jan 25 10:35:30 2017 -0800
committer Mikhail Naganov <mnaganov@google.com> Wed Jan 25 10:35:30 2017 -0800
tree 1a1e994236e73f2088f84b710c0d5a189f56f177
parent c0461f5b18eb6d5516804810f315e6c23879a09d

audioflinger: Fix crash in EffectChain::dump

Check for null buffer in dumpInOutBuffer

Bug: 34691158
Change-Id: I5d11fcb1ce0170da7a742fdbe42a7eaeba4370fe
Test: try bug repro steps

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 2ce99e2..70929e4 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1942,7 +1942,9 @@
 
 static void dumpInOutBuffer(
         char *dump, size_t dumpSize, bool isInput, EffectBufferHalInterface *buffer) {
-    if (buffer->externalData() != nullptr) {
+    if (buffer == nullptr) {
+        snprintf(dump, dumpSize, "%p", buffer);
+    } else if (buffer->externalData() != nullptr) {
         snprintf(dump, dumpSize, "%p -> %p",
                 isInput ? buffer->externalData() : buffer->audioBuffer()->raw,
                 isInput ? buffer->audioBuffer()->raw : buffer->externalData());