diff options
| author | Tom Taylor <tomtaylor@google.com> | 2017-07-12 19:09:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-12 19:09:10 +0000 |
| commit | a072033ce429cdd36bb6b3ae63c2083944994b1e (patch) | |
| tree | 757c57b131f6988ac19eab10fc8cb4948b5b959b | |
| parent | 172aeda52be6a357a972578c862295e41bf2a73d (diff) | |
| parent | 6ea30b87b14ca682c6cae2ab2e3f121a88d4121b (diff) | |
| download | Messaging-a072033ce429cdd36bb6b3ae63c2083944994b1e.tar.gz | |
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4
am: 6ea30b87b1
Change-Id: I28cfc0b9abbc28420feec7c690406ebe922b31e8
| -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 |