diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-13 07:26:01 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-13 07:26:01 +0000 |
commit | d5a4aba436b25fa85521e863e521ae1d09f846b2 (patch) | |
tree | 87322725938ae70eac8d317378862f76e1e973bd | |
parent | 805da545777d12d2f28500038a834fbb1fbba274 (diff) | |
parent | 7ace2d5308939c159ade2129c702a5fd856e88b3 (diff) | |
download | android_packages_apps_Messaging-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.gz android_packages_apps_Messaging-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.bz2 android_packages_apps_Messaging-staging/lineage-15.0_rebase-android-8.0.0_r23.zip |
release-request-60a1dec6-db7d-4d2a-8ddf-8cf91c3bd1f8-for-git_oc-dr1-release-4176699 snap-temp-L56000000081901251staging/lineage-15.0_rebase-android-8.0.0_r23
Change-Id: I6698b6b439b288a9235b7521da71481a3c7eaffd
-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 |