summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseven <lingtongshen@gmail.com>2015-08-05 07:17:11 +0000
committerseven <lingtongshen@gmail.com>2015-08-05 07:17:11 +0000
commitf8fd79b464192b33be09a472f0691273479f9f86 (patch)
tree62e8a3e81eaafe615fed740804a053abe29616eb
parentb047af4d846dea5d69e3b3d51cbf5f841dd65ca5 (diff)
downloadMms-f8fd79b464192b33be09a472f0691273479f9f86.tar.gz
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
-rw-r--r--src/com/android/mms/transaction/MessageStatusService.java4
1 files changed, 3 insertions, 1 deletions
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;