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

Commit 571d9731 authored by Wei Jia's avatar Wei Jia
Browse files

Merge commit 'c642d411' into HEAD 

DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.

Bug: 21443020
(cherry picked from commit 760f92f8)

Change-Id: I5bc68e3e7f0278b8bbbe0ad5b87d6e8e2dbabd42
parents cf69487d c642d411

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+9 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) { 
}



void SoftwareRenderer::render(

        const void *data, size_t /*size*/, int64_t timestampNs,

        const void *data, size_t size, int64_t timestampNs,

        void* /*platformPrivate*/, const sp<AMessage>& format) {

    resetFormatIfChanged(format);
@@ -210,6 +210,9 @@ void SoftwareRenderer::render( 
                buf->stride, buf->height,

                0, 0, mCropWidth - 1, mCropHeight - 1);

    } else if (mColorFormat == OMX_COLOR_FormatYUV420Planar) {

        if ((size_t)mWidth * mHeight * 3 / 2 > size) {

            goto skip_copying;

        }

        const uint8_t *src_y = (const uint8_t *)data;

        const uint8_t *src_u = (const uint8_t *)data + mWidth * mHeight;

        const uint8_t *src_v = src_u + (mWidth / 2 * mHeight / 2);
@@ -239,6 +242,10 @@ void SoftwareRenderer::render( 
        }

    } else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar

            || mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {

        if ((size_t)mWidth * mHeight * 3 / 2 > size) {

            goto skip_copying;

        }



        const uint8_t *src_y =

            (const uint8_t *)data;
@@ -275,6 +282,7 @@ void SoftwareRenderer::render( 
        LOG_ALWAYS_FATAL("bad color format %#x", mColorFormat);

    }



skip_copying:

    CHECK_EQ(0, mapper.unlock(buf->handle));



    if ((err = native_window_set_buffers_timestamp(mNativeWindow.get(),