diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-06 20:59:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-06 20:59:38 +0000 |
| commit | 3aa95defac2624f05130927ea3e3f5a56ea617e5 (patch) | |
| tree | 885c5ddc5fa652739dba80735354f88c7b83c707 | |
| parent | 34a740d5360edd1f0bfd6a13b4d75667f550a512 (diff) | |
| parent | 33f0363ef1c22781f4dffc8644591543431eda89 (diff) | |
| download | frameworks_av-3aa95defac2624f05130927ea3e3f5a56ea617e5.tar.gz frameworks_av-3aa95defac2624f05130927ea3e3f5a56ea617e5.tar.bz2 frameworks_av-3aa95defac2624f05130927ea3e3f5a56ea617e5.zip | |
Merge "Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer" into qt-dev
| -rw-r--r-- | drm/libmediadrm/CryptoHal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp index 4dda5d7a32..d62ccd6be1 100644 --- a/drm/libmediadrm/CryptoHal.cpp +++ b/drm/libmediadrm/CryptoHal.cpp @@ -301,7 +301,7 @@ status_t CryptoHal::toSharedBuffer(const sp<IMemory>& memory, int32_t seqNum, :: ssize_t offset; size_t size; - if (memory == NULL && buffer == NULL) { + if (memory == NULL || buffer == NULL) { return UNEXPECTED_NULL; } |