Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c01d8af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev 

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910f am: 12840141 am: 33508aff am: 0de0b680
  [automerger] Check buffer size in useBuffer in software components am: 4e79910f am: 12840141 am: 33508aff
  [automerger] Check buffer size in useBuffer in software components am: 4e79910f am: 12840141
  [automerger] Check buffer size in useBuffer in software components am: 4e79910f
  Check buffer size in useBuffer in software components
parents dba49298 6d0c3ebd

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -199,6 +199,13 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::useBuffer( 
    Mutex::Autolock autoLock(mLock);

    Mutex::Autolock autoLock(mLock);

    CHECK_LT(portIndex, mPorts.size());

    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 = new OMX_BUFFERHEADERTYPE;

    (*header)->nSize = sizeof(OMX_BUFFERHEADERTYPE);

    (*header)->nSize = sizeof(OMX_BUFFERHEADERTYPE);

    (*header)->nVersion.s.nVersionMajor = 1;

    (*header)->nVersion.s.nVersionMajor = 1;
@@ -221,8 +228,6 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::useBuffer( 
    (*header)->nOutputPortIndex = portIndex;

    (*header)->nOutputPortIndex = portIndex;

    (*header)->nInputPortIndex = portIndex;

    (*header)->nInputPortIndex = portIndex;





    PortInfo *port = &mPorts.editItemAt(portIndex);



    CHECK(mState == OMX_StateLoaded || port->mDef.bEnabled == OMX_FALSE);

    CHECK(mState == OMX_StateLoaded || port->mDef.bEnabled == OMX_FALSE);





    CHECK_LT(port->mBuffers.size(), port->mDef.nBufferCountActual);

    CHECK_LT(port->mBuffers.size(), port->mDef.nBufferCountActual);