diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-21 03:53:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 03:53:30 +0000 |
| commit | f7b35f62b07f2a464278841533540777aebea0e6 (patch) | |
| tree | 1d42ab0a4f0d4130a0d485a5925421c92d72d019 /jni | |
| parent | 1a74c7ed4d038c84d107e99bf7b2bc5ed4f3865d (diff) | |
| parent | 3e0289f54abff3a9ad6c0b11ff828a5ad3c05271 (diff) | |
| download | android_packages_apps_Bluetooth-f7b35f62b07f2a464278841533540777aebea0e6.tar.gz android_packages_apps_Bluetooth-f7b35f62b07f2a464278841533540777aebea0e6.tar.bz2 android_packages_apps_Bluetooth-f7b35f62b07f2a464278841533540777aebea0e6.zip | |
am 3e0289f5: Merge "Native crash SIGSEGV bad ptr from /system/lib/libdvm.so"
* commit '3e0289f54abff3a9ad6c0b11ff828a5ad3c05271':
Native crash SIGSEGV bad ptr from /system/lib/libdvm.so
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/com_android_bluetooth_gatt.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp index b85b9e911..cfb7b5553 100644 --- a/jni/com_android_bluetooth_gatt.cpp +++ b/jni/com_android_bluetooth_gatt.cpp @@ -1133,6 +1133,11 @@ static void gattClientWriteCharacteristicNative(JNIEnv* env, jobject object, { if (!sGattIf) return; + if (value == NULL) { + warn("gattClientWriteCharacteristicNative() 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); |