commit 4432b0c418b4adb24da25d2236bfedc8bcfab92e
author Dan Stoza <stoza@google.com> Tue May 16 21:18:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 21:18:20 2017 +0000
tree d02dbe06a354df5c4e60848f4152dcca2f9f218c
parent eb576150d52a451f596a1e09fc06cee025a62a53
parent a1b1e635ccef0536a173c1baa76ab88b2a4d9082

Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f am: 2fe15aa6f0 am: cce83f15e5 am: 9a44ee0742 am: 787aa48f41 am: f69675e5c2 am: d65a388e1b am: b829d2abe9 am: 79a34dd24b
am: a1b1e635cc

Change-Id: Idfd63642dda3ae741056b75c9c9ddccd63feb76f

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index d1a9cbb..c681051 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -306,6 +306,12 @@
         return result;
     }
 
+    if (buf < 0 || buf >= NUM_BUFFER_SLOTS) {
+        ALOGE("dequeueBuffer: IGraphicBufferProducer returned invalid slot number %d", buf);
+        android_errorWriteLog(0x534e4554, "36991414"); // SafetyNet logging
+        return FAILED_TRANSACTION;
+    }
+
     Mutex::Autolock lock(mMutex);
 
     sp<GraphicBuffer>& gbuf(mSlots[buf].buffer);