From 33f0363ef1c22781f4dffc8644591543431eda89 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Fri, 3 May 2019 15:10:56 -0700
Subject: Fix NULL pointer dereference issues in CryptoHal::toSharedBuffer

bug:111636206
test: gts media tests
Change-Id: Ia3b664ccff554000084438f74e004a82c69a20da
---
 drm/libmediadrm/CryptoHal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drm')

diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 4dda5d7a32..d62ccd6be1 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -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;
     }
 
-- 
cgit v1.2.3