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

Commit b6b28e58 authored by Brian Duddie's avatar Brian Duddie
Browse files

Fix null deref in sensors 2.0 VTS teardown 

Avoid attempting to clean up resources that were never initialized, e.g.
if the target device doesn't support the version of the HAL in question.

Fixes: 134911861
Test: run VtsHalSensorsV2_0Target on device that only supports HAL v1.0
Change-Id: I6b529fae13b1347d533a19e04f1c7748bcda961b
parent 22f6dcec

sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp

+8 −4
Original line number Diff line number Diff line
@@ -109,12 +109,16 @@ bool SensorsHidlEnvironmentV2_0::resetHal() { 
void SensorsHidlEnvironmentV2_0::HidlTearDown() {

    mStopThread = true;



    if (mEventQueueFlag != nullptr) {

        // Wake up the event queue so the poll thread can exit

        mEventQueueFlag->wake(asBaseType(EventQueueFlagBits::READ_AND_PROCESS));

        if (mPollThread.joinable()) {

            mPollThread.join();

        }



        EventFlag::deleteEventFlag(&mEventQueueFlag);

    }

}



void SensorsHidlEnvironmentV2_0::startPollingThread() {

    mStopThread = false;