commit 06e89d68d671ee486eeda3ab3bbf064ef21b83ee
author Bryan Ferris <bferris@google.com> Fri Dec 20 20:08:48 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 20 20:08:48 2019 +0000
tree 63759671b04edb4e577588e92d84c180d01d234b
parent 0ec6f56ea142285856dec8ac0ea35f3988621abc
parent 18824a94a8114661456a103465b291fed336ab39

Merge "AudioFlinger: Clear effect_uuid_t in case of short read" into qt-qpr1-dev

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);