commit b0b882fbb897ea998ce624605095306bf7ff0e48
author Dongwon Kang <dwkang@google.com> Sat Jun 17 01:24:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 17 01:24:18 2017 +0000
tree a42d53936bcea40169c0589db4d61bb3a5eed4b5
parent 8c4762d88b6fee0eb84de36b898c5ede633df1b8
parent 88f181fef320c9fec8889e368fcf28081123cd0a

Merge "Report error when using buffers for secure codec without providing crypto" into oc-dev
am: 88f181fef3

Change-Id: Iec99a4cebc9088c13bcee0bb5aaf5f0258daab4c

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index f695717..bd71632 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -734,6 +734,8 @@
             // XXX: save indication that it's crypto in some way...
             mAnalyticsItem->setInt32(kCodecCrypto, 1);
         }
+    } else if (mFlags & kFlagIsSecure) {
+        ALOGW("Crypto or descrambler should be given for secure codec");
     }
 
     // save msg for reset
@@ -2593,6 +2595,10 @@
     if (csd->size() > codecInputData->capacity()) {
         return -EINVAL;
     }
+    if (codecInputData->data() == NULL) {
+        ALOGV("Input buffer %zu is not properly allocated", bufferIndex);
+        return -EINVAL;
+    }
 
     memcpy(codecInputData->data(), csd->data(), csd->size());