commit b6b28e58c421c12ca70c71d2f396e9ce11e2e5df
author Brian Duddie <bduddie@google.com> Mon Jun 10 09:14:14 2019 -0700
committer Brian Duddie <bduddie@google.com> Tue Jun 11 17:43:22 2019 +0000
tree b931b23c6ff5e6b609ec34088bedf58e18137c14
parent 22f6dcec7e81c1a747b516377d2e7fc8cb06c508

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

sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp

diff --git a/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp b/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp
index be7415b..5f71654 100644
--- a/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp
+++ b/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp
@@ -109,11 +109,15 @@
 void SensorsHidlEnvironmentV2_0::HidlTearDown() {
     mStopThread = true;
 
-    // Wake up the event queue so the poll thread can exit
-    mEventQueueFlag->wake(asBaseType(EventQueueFlagBits::READ_AND_PROCESS));
-    mPollThread.join();
+    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);
+        EventFlag::deleteEventFlag(&mEventQueueFlag);
+    }
 }
 
 void SensorsHidlEnvironmentV2_0::startPollingThread() {