commit 3f22a4820cf64a895a84b5b521b5eb58a9c4787f
author Tom Taylor <tomtaylor@google.com> Wed Jul 12 19:24:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 12 19:24:29 2017 +0000
tree 09bd4b880fd1be7dd8c6a21fc6659c7b46c0abf9
parent 3fb6abb42199b98a23a6e0569b83519919f9d015
parent c12af8d012b6b9328e2fab3ff7f33c7901bb0bf6

37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f
am: c12af8d012

Change-Id: I5c9fd14d532b95caaceb8ca8b5e70feee77c34a0

src/com/android/messaging/datamodel/media/GifImageResource.java

diff --git a/src/com/android/messaging/datamodel/media/GifImageResource.java b/src/com/android/messaging/datamodel/media/GifImageResource.java
index d50cf47..6801165 100644
--- a/src/com/android/messaging/datamodel/media/GifImageResource.java
+++ b/src/com/android/messaging/datamodel/media/GifImageResource.java
@@ -23,6 +23,7 @@
 import android.support.rastermill.FrameSequenceDrawable;
 
 import com.android.messaging.util.Assert;
+import com.android.messaging.util.LogUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,7 +56,14 @@
 
     @Override
     public Drawable getDrawable(Resources resources) {
-        return new FrameSequenceDrawable(mFrameSequence);
+        try {
+            return new FrameSequenceDrawable(mFrameSequence);
+        } catch (final Exception e) {
+            // Malicious gif images can make platform throw different kind of exceptions. Catch
+            // them all.
+            LogUtil.e(LogUtil.BUGLE_TAG, "Error getting drawable for GIF", e);
+            return null;
+        }
     }
 
     @Override