commit 135ab55d9bf37d4001f94ec0f8e2a5c5e038a05c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 15 21:27:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 21:27:06 2019 +0000
tree 79a28192ba9513a24249865669855386f6d213df
parent 74224fde9a3e41c878812e18c6e6a8adca0dc827
parent 9b9b3de144ce3a145b01a01424b706f69c6d7ed6

Merge "media utils: fix UAF in TimeCheckThread"

media/utils/TimeCheck.cpp

diff --git a/media/utils/TimeCheck.cpp b/media/utils/TimeCheck.cpp
index 265a232..96f7802 100644
--- a/media/utils/TimeCheck.cpp
+++ b/media/utils/TimeCheck.cpp
@@ -82,10 +82,10 @@
         if (waitTimeNs > 0) {
             status = mCond.waitRelative(mMutex, waitTimeNs);
         }
-    }
-    if (status != NO_ERROR) {
-        LOG_EVENT_STRING(LOGTAG_AUDIO_BINDER_TIMEOUT, tag);
-        LOG_ALWAYS_FATAL("TimeCheck timeout for %s", tag);
+        if (status != NO_ERROR) {
+            LOG_EVENT_STRING(LOGTAG_AUDIO_BINDER_TIMEOUT, tag);
+            LOG_ALWAYS_FATAL("TimeCheck timeout for %s", tag);
+        }
     }
     return true;
 }