commit d0ff71542617033b4000a024e2d85022a69a80a4
author Scott Warner <Tortel1210@gmail.com> Tue Nov 15 05:53:42 2016 -0500
committer B--B <dark.schneider.ds@gmail.com> Tue Dec 06 19:38:30 2016 +0100
tree b916f008980d02cd844f77f8f26686859aad9413
parent ee8d336046ed27dd0a0bda5b3ce3cb62ccb1f322

bluetooth: Prevent null pointer crashes in A2DP initNative

Change-Id: I91f555ae8f2311d80145fe6b33a6c93b1997ca66

jni/com_android_bluetooth_a2dp.cpp

diff --git a/jni/com_android_bluetooth_a2dp.cpp b/jni/com_android_bluetooth_a2dp.cpp
index 7c15c37..fd286ff 100644
--- a/jni/com_android_bluetooth_a2dp.cpp
+++ b/jni/com_android_bluetooth_a2dp.cpp
@@ -221,7 +221,13 @@
     const char *offload_capabilities;
     bt_status_t status;
 
-    offload_capabilities = env->GetStringUTFChars(offload_cap, NULL);
+    // Calling GetStringUTFChars with a null jstring can cause ART to crash
+    if (offload_cap != NULL) {
+        offload_capabilities = env->GetStringUTFChars(offload_cap, NULL);
+    } else {
+        offload_capabilities = NULL;
+    }
+
 
     if ( (btInf = getBluetoothInterface()) == NULL) {
         ALOGE("Bluetooth module is not loaded");