commit 605f4660b11c2f97ef364782f50ab0f33b991fcb
author Cheney Ni <cheneyni@google.com> Wed Sep 04 14:34:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 04 14:34:50 2019 -0700
tree 6defb704d3bac7c95f45bbd52739497eb6c42e9a
parent c55034e1598ea06be90c6ce3f1a7f320e9eeecd3
parent 460a9b814aa79c0667a57e69814456e9003d70c3

AdapterService: Check the PIN code length before using am: d6c84aa349
am: 460a9b814a

Change-Id: Ic1f8a10bc0284773d10f2c02883fe638b340d1af

src/com/android/bluetooth/btservice/AdapterService.java

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 508eacf..53cf723 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -2233,6 +2233,12 @@
             return false;
         }
 
+        if (pinCode.length != len) {
+            android.util.EventLog.writeEvent(0x534e4554, "139287605", -1,
+                    "PIN code length mismatch");
+            return false;
+        }
+
         StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED,
                 obfuscateAddress(device), 0, device.getType(),
                 BluetoothDevice.BOND_BONDING,
@@ -2249,6 +2255,12 @@
             return false;
         }
 
+        if (passkey.length != len) {
+            android.util.EventLog.writeEvent(0x534e4554, "139287605", -1,
+                    "Passkey length mismatch");
+            return false;
+        }
+
         StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED,
                 obfuscateAddress(device), 0, device.getType(),
                 BluetoothDevice.BOND_BONDING,