| commit | 8a839e74bf11bce86e0b87d7c0d557cc40993632 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon May 06 14:23:39 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 06 14:23:39 2019 -0700 |
| tree | 2997212ea28aae7587ed8428c410d83f7e53534f | |
| parent | 0a6b721517ead51c326d20a16a019a21b02581d2 [diff] | |
| parent | c8494f646f69c4ba97fa4a10c05a27d373fc0eda [diff] |
Merge "Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer" into qt-dev am: 3aa95defac am: c8494f646f Change-Id: Iec32cce0d7a94c3b4f729364d2bc03cf1a68a378
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; }