diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 20:05:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 20:05:08 +0000 |
| commit | a9296786e36577a05de3f3500db0cdb2fabf13c0 (patch) | |
| tree | 667e5e739b038a789797ace35b68120e238e1110 | |
| parent | 911b808a6568fee9c2fd1aa89039161195873350 (diff) | |
| parent | 4bbfb6d8815002fc79b26aebba5f3ad2226c468e (diff) | |
| download | frameworks_av-a9296786e36577a05de3f3500db0cdb2fabf13c0.tar.gz frameworks_av-a9296786e36577a05de3f3500db0cdb2fabf13c0.tar.bz2 frameworks_av-a9296786e36577a05de3f3500db0cdb2fabf13c0.zip | |
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881
Change-Id: I943db03ec26b3a7ec24636df46e2a21a472d52d2
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index ee5ea936c4..7931ed755c 100644 --- a/drm/libmediadrm/ICrypto.cpp +++ b/drm/libmediadrm/ICrypto.cpp @@ -264,8 +264,12 @@ status_t BnCrypto::onTransact( { CHECK_INTERFACE(ICrypto, data, reply); - uint8_t uuid[16]; - data.read(uuid, sizeof(uuid)); + uint8_t uuid[16] = {0}; + if (data.read(uuid, sizeof(uuid)) != NO_ERROR) { + android_errorWriteLog(0x534e4554, "144767096"); + reply->writeInt32(BAD_VALUE); + return OK; + } size_t opaqueSize = data.readInt32(); void *opaqueData = NULL; @@ -280,7 +284,11 @@ status_t BnCrypto::onTransact( return NO_MEMORY; } - 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); |