commit d66a90290b2cc7a9a538c54328df8b2292a91033
author Chris Craik <ccraik@google.com> Sat Feb 10 19:30:22 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 10 19:30:22 2018 +0000
tree 9b65c649f71c97c11c2b83077a54365049a094d2
parent 7453f1141afd7b69b429843f5429295635c7897b
parent f4c429cda504e73e5dbd37b69fd72fbaf9f96298

[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4 am: 7226042d2a am: 6b2d056043 am: 24f183e9b7
am: f4c429cda5

Change-Id: I980a3ccd194ad39ebba6fc174d215cb6140a84b8

framesequence/jni/FrameSequence_gif.cpp

diff --git a/framesequence/jni/FrameSequence_gif.cpp b/framesequence/jni/FrameSequence_gif.cpp
index 3ba09dc..ed47834 100644
--- a/framesequence/jni/FrameSequence_gif.cpp
+++ b/framesequence/jni/FrameSequence_gif.cpp
@@ -111,12 +111,14 @@
     }
 #endif
 
-    if (mGif->SColorMap) {
+    const ColorMapObject* cmap = mGif->SColorMap;
+    if (cmap) {
         // calculate bg color
         GraphicsControlBlock gcb;
         DGifSavedExtensionToGCB(mGif, 0, &gcb);
-        if (gcb.TransparentColor == NO_TRANSPARENT_COLOR) {
-            mBgColor = gifColorToColor8888(mGif->SColorMap->Colors[mGif->SBackGroundColor]);
+        if (gcb.TransparentColor == NO_TRANSPARENT_COLOR
+                && mGif->SBackGroundColor < cmap->ColorCount) {
+            mBgColor = gifColorToColor8888(cmap->Colors[mGif->SBackGroundColor]);
         }
     }
 }
@@ -358,4 +360,3 @@
         acceptsBuffers,
 };
 static Registry gRegister(gEntry);
-