diff options
| author | Jeff Tinker <jtinker@google.com> | 2019-05-03 15:10:56 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2019-05-03 15:48:32 -0700 |
| commit | 33f0363ef1c22781f4dffc8644591543431eda89 (patch) | |
| tree | 15a184bfeec4ae89895f93cc065bd816c92820f6 /drm | |
| parent | 2ddd17ca5c49fe02c459b7026d4c271bf76c4e3c (diff) | |
| download | frameworks_av-33f0363ef1c22781f4dffc8644591543431eda89.tar.gz frameworks_av-33f0363ef1c22781f4dffc8644591543431eda89.tar.bz2 frameworks_av-33f0363ef1c22781f4dffc8644591543431eda89.zip | |
Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer
bug:111636206
test: gts media tests
Change-Id: Ia3b664ccff554000084438f74e004a82c69a20da
Diffstat (limited to 'drm')
| -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; } |