summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-05-03 11:38:55 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-05-03 12:00:06 -0700
commite1914075def5fb01ec1e4db80d337dd0589a9f39 (patch)
tree172408dfc0292753cd3d74e2929bd349986ec473
parent0ffc2ce03ff0455e0a65ed4e58a280c85b4c2184 (diff)
parent9b534de2aca5d790c2a1c4d76b545f16137d95dd (diff)
downloadandroid_system_bt-e1914075def5fb01ec1e4db80d337dd0589a9f39.tar.gz
android_system_bt-e1914075def5fb01ec1e4db80d337dd0589a9f39.tar.bz2
android_system_bt-e1914075def5fb01ec1e4db80d337dd0589a9f39.zip
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: Ife24446d9ec52c93426b58b0bf2e353cc201bfb7
-rw-r--r--btif/src/btif_dm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index 2991fee64..34b8077ea 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -2728,7 +2728,7 @@ bt_status_t btif_dm_pin_reply( const bt_bdaddr_t *bd_addr, uint8_t accept,
uint8_t pin_len, bt_pin_code_t *pin_code)
{
BTIF_TRACE_EVENT("%s: accept=%d", __FUNCTION__, accept);
- if (pin_code == NULL)
+ if (pin_code == NULL || pin_len > PIN_CODE_LEN)
return BT_STATUS_FAIL;
#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))