Merge "Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer" into qt-dev (3aa95def) · Commits · e / os / android_frameworks_av

drm/libmediadrm/CryptoHal.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -301,7 +301,7 @@ status_t CryptoHal::toSharedBuffer(const sp<IMemory>& memory, int32_t seqNum, ::
	ssize_t offset;		ssize_t offset;
	size_t size;		size_t size;

	if (memory == NULL && buffer == NULL) {		if (memory == NULL \|\| buffer == NULL) {
	return UNEXPECTED_NULL;		return UNEXPECTED_NULL;
	}		}