commit e77fa2db67d318c3b45fc769f5c43030b4b09da7
author android-build-team Robot <android-build-team-robot@google.com> Sun Feb 11 08:22:54 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Feb 11 08:22:54 2018 +0000
tree 9b65c649f71c97c11c2b83077a54365049a094d2
parent 1d2026e7de6616529070470b0d0c6cddd3412e08
parent d66a90290b2cc7a9a538c54328df8b2292a91033

Snap for 4598635 from d66a90290b2cc7a9a538c54328df8b2292a91033 to pi-release

Change-Id: Ifcc0c6adaa73b095655b542f07c3e3398dc3eabc

framesequence/Android.mk

diff --git a/framesequence/Android.mk b/framesequence/Android.mk
index 1b3cf2d..dbe47ea 100644
--- a/framesequence/Android.mk
+++ b/framesequence/Android.mk
@@ -25,4 +25,4 @@
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
-include $(call all-makefiles-under, $(LOCAL_PATH))
+include $(call first-makefiles-under, $(LOCAL_PATH))

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