Commit 8a839e74 authored May 06, 2019 by Jeff Tinker Committed by android-build-merger May 06, 2019

Merge "Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer" into qt-dev am: 3aa95def

am: c8494f64

Change-Id: Iec32cce0d7a94c3b4f729364d2bc03cf1a68a378

drm/libmediadrm/CryptoHal.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}