commit dc857dc042bc8f111449faffe9a10aed34bfa24c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 20:38:30 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 20:38:30 2019 +0000
tree 7f6ba26f72cdd73ac22ab593d143cd122921e6a0
parent 77b8c802dbf3d63e19ff44e7bb2fe47b37e8d6b2
parent 573c30d84c4f7174094cf39fac6c3c2f2770e5b4

Merge "AudioFlinger: Clear effect_uuid_t in case of short read" into qt-qpr1-dev am: 06e89d68d6 am: 573c30d84c

Change-Id: Id099fe294b572411ea38c0f0a3d2e043b7df5ac0

media/libaudioclient/IAudioFlinger.cpp

diff --git a/media/libaudioclient/IAudioFlinger.cpp b/media/libaudioclient/IAudioFlinger.cpp
index 90783eb..0801e5f 100644
--- a/media/libaudioclient/IAudioFlinger.cpp
+++ b/media/libaudioclient/IAudioFlinger.cpp
@@ -1355,10 +1355,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);