diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-25 07:39:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-25 07:39:36 +0000 |
commit | efc3fb8401bee7dc0084baa0306fa15768b225f0 (patch) | |
tree | 09bd4b880fd1be7dd8c6a21fc6659c7b46c0abf9 | |
parent | 3e902e8863e726cd056d8067165a4356fd98eeda (diff) | |
parent | 8bd347d15846e554189515038d876b7bf5f01589 (diff) | |
download | Messaging-efc3fb8401bee7dc0084baa0306fa15768b225f0.tar.gz |
release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875
Change-Id: Ia89b0b3aacb5bb065bf7a89e0843ef4754f4bf5a
-rw-r--r-- | src/com/android/messaging/datamodel/media/GifImageResource.java | 10 |
1 files changed, 9 insertions, 1 deletions
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.FrameSequence; 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 @@ public class GifImageResource extends ImageResource { @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 |