From aa0071d11b597a3e8fa15544743af2791a54d599 Mon Sep 17 00:00:00 2001 From: Eric Olsen Date: Fri, 19 Mar 2010 13:50:56 -0700 Subject: [PATCH] Add check for null name on SCO connect Change-Id: I5f5064fd57a5fffaf02b3e96b7faab219c490e86 Signed-off-by: Eric Olsen --- core/jni/android_bluetooth_ScoSocket.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/jni/android_bluetooth_ScoSocket.cpp b/core/jni/android_bluetooth_ScoSocket.cpp index 8588bc2bdae62..94e4409a4aba8 100644 --- a/core/jni/android_bluetooth_ScoSocket.cpp +++ b/core/jni/android_bluetooth_ScoSocket.cpp @@ -404,11 +404,15 @@ static jboolean connectNative(JNIEnv *env, jobject object, jstring address, env->ReleaseStringUTFChars(address, c_address); data->is_accept = false; - c_name = env->GetStringUTFChars(name, NULL); - /* See if this device is in the black list */ - data->sco_pkt_type = getScoType(data->address, c_name); - env->ReleaseStringUTFChars(name, c_name); - + if (name == NULL) { + LOGE("%s: Null pointer passed in for device name", __FUNCTION__); + data->sco_pkt_type = 0; + } else { + c_name = env->GetStringUTFChars(name, NULL); + /* See if this device is in the black list */ + data->sco_pkt_type = getScoType(data->address, c_name); + env->ReleaseStringUTFChars(name, c_name); + } if (pthread_create(&thread, NULL, &work_thread, (void *)data) < 0) { LOGE("%s: pthread_create() failed: %s", __FUNCTION__, strerror(errno)); return JNI_FALSE;