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

Commit ca9c6760 authored by Greg Kaiser's avatar Greg Kaiser
Browse files

ContextHubService: Avoid null pointer dereference 

We stop calling closeLoadTxn() with a nullptr, so we won't crash.

Bug: 31354170
Change-Id: Iebec9ff90a12b350811c24886917f084de88a7d5
parent 57e29b4b

core/jni/android_hardware_location_ContextHubService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,8 @@ static jint nativeSendMessage(JNIEnv *env, jobject instance, jintArray header_, 
    if (retVal != 0) {

        ALOGD("Send Message failure - %d", retVal);

        if (msgType == CONTEXT_HUB_LOAD_APP) {

            closeLoadTxn(false, nullptr);

            jint ignored;

            closeLoadTxn(false, &ignored);

        } else if (msgType == CONTEXT_HUB_UNLOAD_APP) {

            closeUnloadTxn(false);

        }