Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev

3987efa9 · Matthew Xie · Android (Google) Code Review · cd68000c · 460d53a0 · 3987efa9
Commit 3987efa9 authored 11 years ago by Matthew Xie Committed by Android (Google) Code Review 11 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

jni/com_android_bluetooth_gatt.cpp jni/com_android_bluetooth_gatt.cpp +5 -0

No files found.
--- a/jni/com_android_bluetooth_gatt.cpp
+++ b/jni/com_android_bluetooth_gatt.cpp
@@ -991,6 +991,11 @@ static void gattClientWriteDescriptorNative(JNIEnv* env, jobject object,
 {
    if (!sGattIf) return;

+    if (value == NULL) {
+        warn("gattClientWriteDescriptorNative() ignoring NULL array");
+        return;
+    }
+
    btgatt_srvc_id_t srvc_id;
    srvc_id.id.inst_id = (uint8_t) service_id_inst_id;
    srvc_id.is_primary = (service_type == BTGATT_SERVICE_TYPE_PRIMARY ? 1 : 0);