commit 599f91540d622f474b045d0e7358d3e2b6a35273
author Roshan Pius <rpius@google.com> Fri Oct 16 18:09:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 16 18:09:22 2015 +0000
tree b00ed5a527e909e064d075ca5f6053fb84804d3b
parent 43a040bdd51e1c7743892ba7dba9e109dd9d90e8
parent aaf4c41e2e353be01fe9cd5f8ca97bf37565dc41

am aaf4c41e: DO NOT MERGE Fix externally reported security vulnerability.

* commit 'aaf4c41e2e353be01fe9cd5f8ca97bf37565dc41':
  DO NOT MERGE Fix externally reported security vulnerability.

sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java

diff --git a/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java b/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
index 0b701ce..545854d 100644
--- a/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
+++ b/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
@@ -58,7 +58,13 @@
 
     private void takeCall(Context context, Intent intent) {
         if (VERBOSE) log("takeCall, intent: " + intent);
-        PhoneAccountHandle accountHandle = intent.getParcelableExtra(SipUtil.EXTRA_PHONE_ACCOUNT);
+        PhoneAccountHandle accountHandle = null;
+        try {
+            accountHandle = intent.getParcelableExtra(SipUtil.EXTRA_PHONE_ACCOUNT);
+        } catch (ClassCastException e) {
+            log("takeCall, Bad account handle detected. Bailing!");
+            return;
+        }
         if (accountHandle != null) {
             Bundle extras = new Bundle();
             extras.putParcelable(SipUtil.EXTRA_INCOMING_CALL_INTENT, intent);