commit 2988ada522ec46b0959f6a587ee536ccde4a4243
author Dongwon Kang <dwkang@google.com> Tue Aug 15 21:50:56 2017 +0000
committer Dongwon Kang <dwkang@google.com> Tue Aug 15 21:50:56 2017 +0000
tree 9f14c8bf6bf2b34c6177d5bce815b290e3c4d339
parent b0744919252bdb299973780fa65d3c89bbc3a51a
parent 00209af1ec4d789554a5caafa80dbdb3d4798aec

[automerger] Check buffer size in useBuffer in software components am: 00209af1ec

Change-Id: Ia8917bf63d965fe087dbb07e454ba6eebb6bcb4f

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

diff --git a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
index 761b425..d89cb99 100644
--- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
+++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
@@ -214,6 +214,13 @@
     Mutex::Autolock autoLock(mLock);
     CHECK_LT(portIndex, mPorts.size());
 
+    PortInfo *port = &mPorts.editItemAt(portIndex);
+    if (size < port->mDef.nBufferSize) {
+        ALOGE("b/63522430, Buffer size is too small.");
+        android_errorWriteLog(0x534e4554, "63522430");
+        return OMX_ErrorBadParameter;
+    }
+
     *header = new OMX_BUFFERHEADERTYPE;
     (*header)->nSize = sizeof(OMX_BUFFERHEADERTYPE);
     (*header)->nVersion.s.nVersionMajor = 1;
@@ -236,8 +243,6 @@
     (*header)->nOutputPortIndex = portIndex;
     (*header)->nInputPortIndex = portIndex;
 
-    PortInfo *port = &mPorts.editItemAt(portIndex);
-
     CHECK(mState == OMX_StateLoaded || port->mDef.bEnabled == OMX_FALSE);
 
     CHECK_LT(port->mBuffers.size(), port->mDef.nBufferCountActual);