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

Commit 2988ada5 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

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

Change-Id: Ia8917bf63d965fe087dbb07e454ba6eebb6bcb4f
parents b0744919 00209af1
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -214,6 +214,13 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::useBuffer(
    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 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::useBuffer(
    (*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);