commit 7396f53056cd6545e5aca7e888863f727a16684d
author Jakub Pawlowski <jpawlowski@google.com> Fri Nov 30 08:32:04 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 30 08:32:04 2018 -0800
tree ba32f7d5a8a5326a31b74654228bb2e8b91c7547
parent abff7881776f4ca1281b62e6f9ef6d0ebc502f6f
parent 0712542a6f2832acb1340156548d84d8d5fe9a5a

Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings am: f843ccbf9e
am: 0712542a6f

Change-Id: Ia2cd4c36a357350f203aa34c42ee0a7711e18a67

core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java

diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java
index f9a2245..5061fa0 100644
--- a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java
+++ b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java
@@ -18,12 +18,15 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.util.EventLog;
 
 import java.util.Random;
 
 /** @hide */
 public final class BluetoothHidDeviceAppSdpSettings implements Parcelable {
 
+    private static final int MAX_DESCRIPTOR_SIZE = 2048;
+
     final public String name;
     final public String description;
     final public String provider;
@@ -36,6 +39,12 @@
         this.description = description;
         this.provider = provider;
         this.subclass = subclass;
+
+        if (descriptors == null || descriptors.length > MAX_DESCRIPTOR_SIZE) {
+            EventLog.writeEvent(0x534e4554, "119819889", -1, "");
+            throw new IllegalArgumentException("descriptors must be not null and shorter than "
+                    + MAX_DESCRIPTOR_SIZE);
+        }
         this.descriptors = descriptors.clone();
     }