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

Commit 91a7e47a 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: af33c978 

am: 396cc342

Change-Id: Ic9f8bce011edd718580971059ae96b0d65c9fdda
parents 78976cea 396cc342

libs/gui/IGraphicBufferProducer.cpp

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

#include <binder/IInterface.h>



#include <gui/BufferQueueDefs.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/IProducerListener.h>
@@ -164,8 +165,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;

    }