diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-21 04:00:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 04:00:14 +0000 |
| commit | 166424306a82cc21d9f4fde3dafd88cb474b1fd9 (patch) | |
| tree | e7dda4c730c9b3b173be2d4b183f1dceb88afb10 /jni | |
| parent | fda571a03e451cbf89fa0e9a184dbf32fea5b5cc (diff) | |
| parent | f7b35f62b07f2a464278841533540777aebea0e6 (diff) | |
| download | android_packages_apps_Bluetooth-166424306a82cc21d9f4fde3dafd88cb474b1fd9.tar.gz android_packages_apps_Bluetooth-166424306a82cc21d9f4fde3dafd88cb474b1fd9.tar.bz2 android_packages_apps_Bluetooth-166424306a82cc21d9f4fde3dafd88cb474b1fd9.zip | |
am f7b35f62: am 3e0289f5: Merge "Native crash SIGSEGV bad ptr from /system/lib/libdvm.so"
* commit 'f7b35f62b07f2a464278841533540777aebea0e6':
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); |