From dc8e2d0620e61fa239050fb2d1af5993faf07538 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Mon, 23 Jan 2017 14:24:12 -0800
Subject: [PATCH] Don't deref a NULL shared buffer base

bug:34624618
Change-Id: I5caee20a944d0c7b5d30f8abdbd8734507914a3a
---
 drm/1.0/default/CryptoPlugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 1a32706ba5..fb61ede14f 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -62,6 +62,11 @@ namespace implementation {
             const DestinationBuffer& destination,
             decrypt_cb _hidl_cb) {
 
+        if (mSharedBufferBase == NULL) {
+            _hidl_cb(Status::BAD_VALUE, 0, "decrypt buffer base not set");
+            return Void();
+        }
+
         android::CryptoPlugin::Mode legacyMode;
         switch(mode) {
         case Mode::UNENCRYPTED: