| commit | 3aa95defac2624f05130927ea3e3f5a56ea617e5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon May 06 20:59:38 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 06 20:59:38 2019 +0000 |
| tree | 885c5ddc5fa652739dba80735354f88c7b83c707 | |
| parent | 34a740d5360edd1f0bfd6a13b4d75667f550a512 [diff] | |
| parent | 33f0363ef1c22781f4dffc8644591543431eda89 [diff] |
Merge "Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer" into qt-dev
diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp index 4dda5d7..d62ccd6 100644 --- a/drm/libmediadrm/CryptoHal.cpp +++ b/drm/libmediadrm/CryptoHal.cpp
@@ -301,7 +301,7 @@ ssize_t offset; size_t size; - if (memory == NULL && buffer == NULL) { + if (memory == NULL || buffer == NULL) { return UNEXPECTED_NULL; }