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

Commit cbfe7591 authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:... 

Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978 am: 396cc342 am: 91a7e47a am: 6a9b41dc am: 1f8b9012 am: 0544fa45 am: 788ff8c1 am: 72c1a6f7 am: 8b99decc am: 83f226ba am: 2d4959d8 am: 6a720033 am: 2c201405
am: 1b9371b8

Change-Id: I4e160a36e4264c1959061c98d57ab0c8bf11aea1
parents 4d9a8d0e 1b9371b8

libs/gui/IGraphicBufferProducer.cpp

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <binder/Parcel.h>

#include <binder/IInterface.h>



#include <gui/BufferQueueDefs.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/IProducerListener.h>
@@ -220,8 +221,16 @@ public: 
        if (result != NO_ERROR) {

            return result;

        }



        *slot = reply.readInt32();

        result = reply.readInt32();

        if (result == NO_ERROR &&

                (*slot < 0 || *slot >= BufferQueueDefs::NUM_BUFFER_SLOTS)) {

            ALOGE("attachBuffer returned invalid slot %d", *slot);

            android_errorWriteLog(0x534e4554, "37478824");

            return UNKNOWN_ERROR;

        }



        return result;

    }