diff options
| author | Tom Taylor <tomtaylor@google.com> | 2017-07-12 19:24:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-12 19:24:50 +0000 |
| commit | 7ace2d5308939c159ade2129c702a5fd856e88b3 (patch) | |
| tree | 87322725938ae70eac8d317378862f76e1e973bd | |
| parent | 441c8b85a6612d4458f309073465a3ca0df1cae3 (diff) | |
| parent | c12af8d012b6b9328e2fab3ff7f33c7901bb0bf6 (diff) | |
| download | Messaging-7ace2d5308939c159ade2129c702a5fd856e88b3.tar.gz | |
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2foreo-dr1-dev
am: c12af8d012
Change-Id: I70465c2290a2ba08d7647acab20bdfb25e8b3ecd
| -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 |