commit f8fd79b464192b33be09a472f0691273479f9f86
author seven <lingtongshen@gmail.com> Wed Aug 05 07:17:11 2015 +0000
committer seven <lingtongshen@gmail.com> Wed Aug 05 07:17:11 2015 +0000
tree 62e8a3e81eaafe615fed740804a053abe29616eb
parent b047af4d846dea5d69e3b3d51cbf5f841dd65ca5

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

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