From e70298e6244dbfd6e1f7fe16a809136f25051dab Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Tue, 31 Mar 2015 09:12:22 -0700 Subject: [PATCH] Catch malformed NOTIFY-IND Fixes #2508 // FREEBIE --- src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java index e6fe208492..2376036cda 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java @@ -40,8 +40,14 @@ public class MmsReceiveJob extends ContextJob { return; } - PduParser parser = new PduParser(data); - GenericPdu pdu = parser.parse(); + PduParser parser = new PduParser(data); + GenericPdu pdu = null; + + try { + pdu = parser.parse(); + } catch (RuntimeException e) { + Log.w(TAG, e); + } if (pdu != null && pdu.getMessageType() == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND) { MmsDatabase database = DatabaseFactory.getMmsDatabase(context);