Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:... (2c201405) · Commits · e / os / android_frameworks_native-old

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;
		}