commit dc8e2d0620e61fa239050fb2d1af5993faf07538
author Jeff Tinker <jtinker@google.com> Mon Jan 23 14:24:12 2017 -0800
committer Jeff Tinker <jtinker@google.com> Wed Jan 25 17:33:30 2017 +0000
tree 426b811d3835c937eb0c9cb1e650c3ca60494aa7
parent a35e6e8239dd1b8d3fc707dd73938af10634638b

Don't deref a NULL shared buffer base

bug:34624618
Change-Id: I5caee20a944d0c7b5d30f8abdbd8734507914a3a

drm/1.0/default/CryptoPlugin.cpp

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 1a32706..fb61ede 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -62,6 +62,11 @@
             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: