commit e4e7b91ec85c3b3bdeb74994a68f4bff0f26aefc
author Robert Shih <robertshih@google.com> Tue Feb 11 20:21:05 2020 +0000
committer Robert Shih <robertshih@google.com> Wed Feb 12 05:01:54 2020 +0000
tree 482e55c9c1c39b62df473fa54ea3ca65520c9a6a
parent 51aa2003766aa35d6c6b3ee688a86e117c65b94d

Revert "BnCrypto: fix use-before-init in CREATE_PLUGIN"

This reverts commit 51aa2003766aa35d6c6b3ee688a86e117c65b94d.

Reason for revert: DRM playback regression

Bug: 149067513
Change-Id: I8d8a51efd57c52b444363ce5f5bd04316b2f4bb8
Merged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313
Merged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1

drm/libmediadrm/ICrypto.cpp

diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp
index fe94044..ee5ea93 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);