commit fdef4bd6d7ea290483c85fb0d77fa7bae5f5ef4e
author Wei Jia <wjia@google.com> Fri Sep 16 00:47:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 16 00:47:20 2016 +0000
tree dc7c7187a778250547ee053fe12b88de071db33e
parent a2ae592010cb5fb8bd575839378f8ad53b0df4e6
parent f80a1f5075a7c6e1982d37c68bfed7c9a611bb20

OMXNodeInstance: sanity check portIndex.
am: f80a1f5075

Change-Id: I065e500d25a8699845ec00d79f4ff7237f345868

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 6f9aee0..392cd2a 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -530,6 +530,12 @@
 
 status_t OMXNodeInstance::enableNativeBuffers(
         OMX_U32 portIndex, OMX_BOOL graphic, OMX_BOOL enable) {
+    if (portIndex >= NELEM(mSecureBufferType)) {
+        ALOGE("b/31385713, portIndex(%u)", portIndex);
+        android_errorWriteLog(0x534e4554, "31385713");
+        return BAD_VALUE;
+    }
+
     Mutex::Autolock autoLock(mLock);
     CLOG_CONFIG(enableNativeBuffers, "%s:%u%s, %d", portString(portIndex), portIndex,
                 graphic ? ", graphic" : "", enable);
@@ -1216,6 +1222,12 @@
         return BAD_VALUE;
     }
 
+    if (portIndex >= NELEM(mSecureBufferType)) {
+        ALOGE("b/31385713, portIndex(%u)", portIndex);
+        android_errorWriteLog(0x534e4554, "31385713");
+        return BAD_VALUE;
+    }
+
     Mutex::Autolock autoLock(mLock);
 
     BufferMeta *buffer_meta = new BufferMeta(size, portIndex);