commit 18824a94a8114661456a103465b291fed336ab39
author Andy Hung <hunga@google.com> Wed Aug 21 14:45:41 2019 -0700
committer Bryan Ferris <bferris@google.com> Fri Dec 20 11:16:25 2019 -0800
tree 2a38dd71236c0f41d50e69ebc38d9dbbf0934a74
parent 9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7

AudioFlinger: Clear effect_uuid_t in case of short read

Bug: 139417189
Test: native test, see bug
Merged-In: I9ef0e58e2e73089eb9a347d5357e040ac69bbdd1
Change-Id: I9ef0e58e2e73089eb9a347d5357e040ac69bbdd1

media/libaudioclient/IAudioFlinger.cpp

diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index dd95e34..efa0512 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -1339,10 +1339,14 @@
         }
         case GET_EFFECT_DESCRIPTOR: {
             CHECK_INTERFACE(IAudioFlinger, data, reply);
-            effect_uuid_t uuid;
-            data.read(&uuid, sizeof(effect_uuid_t));
-            effect_uuid_t type;
-            data.read(&type, sizeof(effect_uuid_t));
+            effect_uuid_t uuid = {};
+            if (data.read(&uuid, sizeof(effect_uuid_t)) != NO_ERROR) {
+                android_errorWriteLog(0x534e4554, "139417189");
+            }
+            effect_uuid_t type = {};
+            if (data.read(&type, sizeof(effect_uuid_t)) != NO_ERROR) {
+                android_errorWriteLog(0x534e4554, "139417189");
+            }
             uint32_t preferredTypeFlag = data.readUint32();
             effect_descriptor_t desc = {};
             status_t status = getEffectDescriptor(&uuid, &type, preferredTypeFlag, &desc);