commit 56fadcb037d2a17736f0bc118f7226fc6f002d85
author android-build-team Robot <android-build-team-robot@google.com> Wed Feb 14 17:18:22 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Feb 14 17:18:22 2018 +0000
tree ca6d77dc34d13cf5d7f1a4ee93f5686d48804c34
parent 2e69265781b31753615261217aae41113d756daf
parent ebd849ed8aa77c0e1dad7a08df4a55845a067b76

Merge cherrypicks of [3614756, 3614757, 3614861, 3614758, 3614759, 3615200, 3615201, 3615202, 3615203, 3615204, 3614670, 3614671, 3615108, 3615109] into oc-mr1-release

Change-Id: I49964d5bf5f5fe6557c8baa50e91e5bc96ce471c

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