commit 6a27094a7b642a0abe5b74b7335b0d45103b41e3
author Dante Russo <drusso@codeaurora.org> Wed Jan 04 17:36:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 04 17:36:35 2017 +0000
tree 70d0a736ce7e7ae68df88ad6d7e7301dd649a3e9
parent 02f13da8e1d303f5b7ccbe21633e6d0cb6331868
parent 4eda8e1eabead3a9115bdd9cedd7e336ed431dbe

fixing a race condition on MsgTask::destroy()
am: 4eda8e1eab

Change-Id: I454c2dcb8a17c43f8e42edd326b950cd8173eac1

msm8909/utils/MsgTask.cpp

diff --git a/msm8909/utils/MsgTask.cpp b/msm8909/utils/MsgTask.cpp
index 6f9d0e9..0e7a3a2 100644
--- a/msm8909/utils/MsgTask.cpp
+++ b/msm8909/utils/MsgTask.cpp
@@ -63,9 +63,9 @@
 }
 
 void MsgTask::destroy() {
+    LocThread* thread = mThread;
     msg_q_unblock((void*)mQ);
-    if (mThread) {
-        LocThread* thread = mThread;
+    if (thread) {
         mThread = NULL;
         delete thread;
     } else {

msm8996/utils/MsgTask.cpp

diff --git a/msm8996/utils/MsgTask.cpp b/msm8996/utils/MsgTask.cpp
index 6f9d0e9..0e7a3a2 100644
--- a/msm8996/utils/MsgTask.cpp
+++ b/msm8996/utils/MsgTask.cpp
@@ -63,9 +63,9 @@
 }
 
 void MsgTask::destroy() {
+    LocThread* thread = mThread;
     msg_q_unblock((void*)mQ);
-    if (mThread) {
-        LocThread* thread = mThread;
+    if (thread) {
         mThread = NULL;
         delete thread;
     } else {

msm8998/utils/MsgTask.cpp

diff --git a/msm8998/utils/MsgTask.cpp b/msm8998/utils/MsgTask.cpp
index 78a3fe0..42079d7 100644
--- a/msm8998/utils/MsgTask.cpp
+++ b/msm8998/utils/MsgTask.cpp
@@ -62,9 +62,9 @@
 }
 
 void MsgTask::destroy() {
+    LocThread* thread = mThread;
     msg_q_unblock((void*)mQ);
-    if (mThread) {
-        LocThread* thread = mThread;
+    if (thread) {
         mThread = NULL;
         delete thread;
     } else {