diff options
| -rw-r--r-- | drm/libmediadrm/CryptoHal.cpp | 5 | ||||
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp index d613a5b585..1fdc6e1954 100644 --- a/drm/libmediadrm/CryptoHal.cpp +++ b/drm/libmediadrm/CryptoHal.cpp @@ -331,10 +331,13 @@ ssize_t CryptoHal::decrypt(const uint8_t keyId[16], const uint8_t iv[16], return status; } secure = false; - } else { + } else if (destination.mType == kDestinationTypeNativeHandle) { hDestination.type = BufferType::NATIVE_HANDLE; hDestination.secureMemory = hidl_handle(destination.mHandle); secure = true; + } else { + android_errorWriteLog(0x534e4554, "70526702"); + return UNKNOWN_ERROR; } ::SharedBuffer hSource; diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index 37dc83bb8b..1d70a4e0f0 100644 --- a/drm/libmediadrm/ICrypto.cpp +++ b/drm/libmediadrm/ICrypto.cpp @@ -369,6 +369,10 @@ status_t BnCrypto::onTransact( android_errorWriteLog(0x534e4554, "71389378"); return OK; } + } else { + reply->writeInt32(BAD_VALUE); + android_errorWriteLog(0x534e4554, "70526702"); + return OK; } AString errorDetailMsg; |