commit f84ae5370242ec407ea143ca98eb1ffd78cf1f15
author Mikhail Naganov <mnaganov@google.com> Mon Apr 15 19:37:29 2024 -0700
committer Mikhail Naganov <mnaganov@google.com> Mon Apr 15 19:37:29 2024 -0700
tree ef5ee020b31cfbeec2753f2501d978941b8e32b4
parent 914339da0b5146690758c6bafbde6c921fa1e6d9

libaudiohal@aidl: Fix 'localReply' scope in 'sendCommand'

Make sure that 'localReply' is available all the time
it is being accessed.

Bug: 333116473
Bug: 335014456
Test: m
Change-Id: I70a8fc7fb710a7a288509af3f8a57d0695c53b1a

media/libaudiohal/impl/StreamHalAidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index c5d52b3..2c0b15e 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -502,13 +502,13 @@
                 "%s %s: must be invoked from the worker thread (%d)",
                 __func__, command.toString().c_str(), workerTid);
     }
+    StreamDescriptor::Reply localReply{};
     {
         std::lock_guard l(mCommandReplyLock);
         if (!mContext.getCommandMQ()->writeBlocking(&command, 1)) {
             ALOGE("%s: failed to write command %s to MQ", __func__, command.toString().c_str());
             return NOT_ENOUGH_DATA;
         }
-        StreamDescriptor::Reply localReply{};
         if (reply == nullptr) {
             reply = &localReply;
         }