diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 23:43:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 23:43:15 +0000 |
| commit | d0d078020e26dd9ff1f870491bbfef0f9b9560de (patch) | |
| tree | 2fcced65e527e9c934e8a424994a507150ae4f87 /drm | |
| parent | f0791037c1676ecb6a4af39acabf33db02982545 (diff) | |
| parent | 36af5d03196ce1ce41c753cdd63931072d2044ea (diff) | |
| download | frameworks_av-d0d078020e26dd9ff1f870491bbfef0f9b9560de.tar.gz frameworks_av-d0d078020e26dd9ff1f870491bbfef0f9b9560de.tar.bz2 frameworks_av-d0d078020e26dd9ff1f870491bbfef0f9b9560de.zip | |
Revert "BnCrypto: fix use-before-init in CREATE_PLUGIN" am: e4e7b91ec8 am: 36af5d0319
Change-Id: Ifa7bc3cd86f60b7fb0d557dbbad12dc7f5a1bcdb
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index fe94044875..ee5ea936c4 100644 --- a/drm/libmediadrm/ICrypto.cpp +++ b/drm/libmediadrm/ICrypto.cpp @@ -264,12 +264,8 @@ status_t BnCrypto::onTransact( { 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 @@ status_t BnCrypto::onTransact( } 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); |