commit b6686e725a5a06757d66898562f20d5ea04ea9b3
author Yu-Han Yang <yuhany@google.com> Wed Apr 13 12:40:52 2022 -0700
committer Yu-Han Yang <yuhany@google.com> Wed Apr 13 17:06:26 2022 -0700
tree 3c96b0480a7caf62377a01698e039f2d5cd538e4
parent 3c25334fccbfea52781152d0a6bc0a0335d66a37

Fix use-after-free in GnssMesaurementInterface

Bug: 228639296
Test: on Cuttlefish
Change-Id: Ibd36d23f2059ae994132099dd67d8fd10f84cd72

gnss/aidl/default/GnssMeasurementInterface.cpp

diff --git a/gnss/aidl/default/GnssMeasurementInterface.cpp b/gnss/aidl/default/GnssMeasurementInterface.cpp
index 2c7241b..228d5bf 100644
--- a/gnss/aidl/default/GnssMeasurementInterface.cpp
+++ b/gnss/aidl/default/GnssMeasurementInterface.cpp
@@ -106,12 +106,14 @@
             std::this_thread::sleep_for(std::chrono::milliseconds(mMinIntervalMillis));
         }
     });
-    mThread.detach();
 }
 
 void GnssMeasurementInterface::stop() {
     ALOGD("stop");
     mIsActive = false;
+    if (mThread.joinable()) {
+        mThread.join();
+    }
 }
 
 void GnssMeasurementInterface::reportMeasurement(const GnssData& data) {