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

Commit 771ed8d7 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am fc43e16a: Merge "Graphics:Add error check when create GraphicBuffer" 

* commit 'fc43e16a':
  Graphics:Add error check when create GraphicBuffer
parents 6f23562e fc43e16a

libs/gui/IGraphicBufferProducer.cpp

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

        if (nonNull) {

            *buf = new GraphicBuffer();

            reply.read(**buf);

            result = reply.read(**buf);

            if(result != NO_ERROR) {

                (*buf).clear();

                return result;

            }

        }

        result = reply.readInt32();

        return result;

libs/ui/GraphicBuffer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ status_t GraphicBuffer::unflatten( 
    if (handle != 0) {

        status_t err = mBufferMapper.registerBuffer(handle);

        if (err != NO_ERROR) {

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

            handle = NULL;

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

                    strerror(-err), err);

            return err;