commit 9db2f426e20d172e3cf35a7167eaaa1f5c8821d4
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 15 16:59:14 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 15 16:59:14 2018 +0000
tree ca6d77dc34d13cf5d7f1a4ee93f5686d48804c34
parent a74aa0ab1277a1664d0940688283f9119ec61947
parent 56fadcb037d2a17736f0bc118f7226fc6f002d85

Snap for 4603989 from 56fadcb037d2a17736f0bc118f7226fc6f002d85 to oc-m2-release

Change-Id: I8d8d3ca66d4c93462a32e642e5ff895947c09ba7

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