| commit | 33f0363ef1c22781f4dffc8644591543431eda89 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri May 03 15:10:56 2019 -0700 |
| committer | Jeff Tinker <jtinker@google.com> | Fri May 03 15:48:32 2019 -0700 |
| tree | 15a184bfeec4ae89895f93cc065bd816c92820f6 | |
| parent | 2ddd17ca5c49fe02c459b7026d4c271bf76c4e3c [diff] [blame] |
Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer bug:111636206 test: gts media tests Change-Id: Ia3b664ccff554000084438f74e004a82c69a20da
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; }