commit cadf7289e0dacf4a40422f0b36f97891649d398b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 13 00:12:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 13 00:12:28 2020 +0000
tree c7dd4e1762048d401f9d6169e008bb66ce2c53f7
parent 1142d3ea289b03f2143b789e65fd174ea4854634
parent e492965229ce184a76eaffe2d9fdfcf9e3db7af2

Revert "BnCrypto: fix use-before-init in CREATE_PLUGIN" am: e4e7b91ec8 am: 36af5d0319 am: d0d078020e am: e492965229

Change-Id: I66ee63192311c41c892747324b61368655da0db0

drm/libmediadrm/ICrypto.cpp

diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp
index 4707593..a2594aa 100644
--- a/drm/libmediadrm/ICrypto.cpp
+++ b/drm/libmediadrm/ICrypto.cpp
@@ -264,12 +264,8 @@
         {
             CHECK_INTERFACE(ICrypto, data, reply);
 
-            uint8_t uuid[16] = {0};
-            if (data.read(uuid, sizeof(uuid)) != NO_ERROR) {
-                android_errorWriteLog(0x534e4554, "144767096");
-                reply->writeInt32(BAD_VALUE);
-                return OK;
-            }
+            uint8_t uuid[16];
+            data.read(uuid, sizeof(uuid));
 
             size_t opaqueSize = data.readInt32();
             void *opaqueData = NULL;
@@ -285,11 +281,6 @@
             }
 
             data.read(opaqueData, opaqueSize);
-            if (data.read(opaqueData, opaqueSize) != NO_ERROR) {
-                android_errorWriteLog(0x534e4554, "144767096");
-                reply->writeInt32(BAD_VALUE);
-                return OK;
-            }
             reply->writeInt32(createPlugin(uuid, opaqueData, opaqueSize));
 
             free(opaqueData);