From f8fd79b464192b33be09a472f0691273479f9f86 Mon Sep 17 00:00:00 2001
From: seven <lingtongshen@gmail.com>
Date: Wed, 5 Aug 2015 07:17:11 +0000
Subject: Fix a NPE when update message status

a NPE excetion could result in DoS attack(CVE-2015-3839)
Signed-off-by: seven_shen <lingtongshen@gmail.com>

Change-Id: I04bddb50f23c6cb5253143f32f52fd1d30dd9655
---
 src/com/android/mms/transaction/MessageStatusService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/mms/transaction/MessageStatusService.java b/src/com/android/mms/transaction/MessageStatusService.java
index 35a500a9..f9c8af20 100644
--- a/src/com/android/mms/transaction/MessageStatusService.java
+++ b/src/com/android/mms/transaction/MessageStatusService.java
@@ -103,7 +103,9 @@ public class MessageStatusService extends IntentService {
             } else {
                 error("Can't find message for status update: " + messageUri);
             }
-        } finally {
+        }catch(NullPointerException e){
+            return null;
+        }finally {
             cursor.close();
         }
         return message;
-- 
cgit v1.2.3