commit d65a388e1b426afb1a4e4c5dd9b47c605ed26b96
author Dan Stoza <stoza@google.com> Tue May 16 21:05:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 21:05:24 2017 +0000
tree 78a69fe3df7a158c386b7d7f9435ec44a39f8cd2
parent a078c0780c256e60bb31258c156ef2c507fb2da7
parent f69675e5c26217602fc794e46e8e0c7b8af15eea

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

Change-Id: Icb1a0aae634951cd903fb2deef632005e01d4d7f

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index dbf8114..8b8a501 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);