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

Commit 1c406b4b authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Merge "Fix UAF in ~CallbackEnv" into tm-dev am: d42f6181 am: ac0f825c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/24234506



Change-Id: Iba42c9b793057751200750826f9e45092ca0c8a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c9a8a38 ac0f825c

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ static void callback_thread_event(bt_cb_thread_evt event) { 
    }

    vm->DetachCurrentThread();

    sHaveCallbackThread = false;

    callbackEnv = NULL;

  }

}