filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 7ace2d5308

Change-Id: I1872889b944cdffa63bafd7a125315d2fe2d7917
This commit is contained in:
Tom Taylor
2017-07-12 19:28:15 +00:00
committed by android-build-merger
parent eaa925147a 7ace2d5308
commit cb822ae902
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/messaging/datamodel/media/GifImageResource.java
View File

@@ -23,6 +23,7 @@ import android.support.rastermill.FrameSequence;
import android.support.rastermill.FrameSequenceDrawable; import android.support.rastermill.FrameSequenceDrawable;
import com.android.messaging.util.Assert; import com.android.messaging.util.Assert;
import com.android.messaging.util.LogUtil;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@@ -55,7 +56,14 @@ public class GifImageResource extends ImageResource {
@Override @Override
public Drawable getDrawable(Resources resources) { 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 @Override