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

Commit fc43e16a authored by Jesse Hall's avatar Jesse Hall Committed by Gerrit Code Review
Browse files

Merge "Graphics:Add error check when create GraphicBuffer"

parents 046b72fc 2aff7025

libs/gui/IGraphicBufferProducer.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,11 @@ public: 
        bool nonNull = reply.readInt32();

        bool nonNull = reply.readInt32();

        if (nonNull) {

        if (nonNull) {

            *buf = new GraphicBuffer();

            *buf = new GraphicBuffer();

            reply.read(**buf);

            result = reply.read(**buf);

            if(result != NO_ERROR) {

                (*buf).clear();

                return result;

            }

        }

        }

        result = reply.readInt32();

        result = reply.readInt32();

        return result;

        return result;

libs/ui/GraphicBuffer.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -281,6 +281,8 @@ status_t GraphicBuffer::unflatten(void const* buffer, size_t size, 
    if (handle != 0) {

    if (handle != 0) {

        status_t err = mBufferMapper.registerBuffer(handle);

        status_t err = mBufferMapper.registerBuffer(handle);

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            width = height = stride = format = usage = 0;

            handle = NULL;

            ALOGE("unflatten: registerBuffer failed: %s (%d)",

            ALOGE("unflatten: registerBuffer failed: %s (%d)",

                    strerror(-err), err);

                    strerror(-err), err);

            return err;

            return err;