Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cefe1eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gatt: fix potential use of NULL" am: 815ea279 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1783347

Change-Id: Ia687430361ed9b35d24d23cec08c485727058bff
parents 5fea601b 815ea279

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1527,10 +1527,12 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject object, 
      if (len != 16) {

        ALOGE("%s: Invalid IRK length '%d'; expected 16", __func__, len);

        jniThrowIOException(env, EINVAL);

        return;

      }

      jbyte* irkBytes = env->GetByteArrayElements(irkByteArray.get(), NULL);

      if (irkBytes == NULL) {

        jniThrowIOException(env, EINVAL);

        return;

      }

      for (int j = 0; j < len; j++) {

        curr.irk[j] = irkBytes[j];