commit 028540b3a16421a5dcf5a0277820464423e0d675
author Ram Mohan M <ram.mohan@ittiam.com> Tue Sep 26 15:36:16 2017 +0530
committer Pawin Vongmasa <pawin@google.com> Fri Sep 29 04:39:48 2017 -0700
tree 87fadfa09b3686095e1a7662c8ea74402ed70b28
parent f213eca9170081ca128288816f404beeb53a41f0

omxvts: misplaced lock can cause race condition

upon unsuccessful return during timed wait, relock the mutex before
accessing message list.

Bug: 63796949

Change-Id: I84a43e148a6415e629cb39a6b9dfe27259f8f2fd

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

diff --git a/media/omx/1.0/vts/functional/common/media_hidl_test_common.h b/media/omx/1.0/vts/functional/common/media_hidl_test_common.h
index e23d781..de043b2 100644
--- a/media/omx/1.0/vts/functional/common/media_hidl_test_common.h
+++ b/media/omx/1.0/vts/functional/common/media_hidl_test_common.h
@@ -126,8 +126,8 @@
         android::Vector<BufferInfo>* iBuffers = nullptr,
         android::Vector<BufferInfo>* oBuffers = nullptr) {
         int64_t finishBy = android::ALooper::GetNowUs() + timeoutUs;
-        android::Mutex::Autolock autoLock(msgLock);
         for (;;) {
+            android::Mutex::Autolock autoLock(msgLock);
             android::List<Message>::iterator it = msgQueue.begin();
             while (it != msgQueue.end()) {
                 if (it->type ==