commit 59ed2dbc347be0ca0f89a39fdf3775ed3c4b36e6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 17 19:03:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 19:03:33 2017 +0000
tree e63e8127b7d9153ff3a7b9c7d6f5354bbc594a17
parent a72ef28f8cc2b894119b470fe6c93d1abe566398
parent bcd0a04befb085da19fec70a681096dad99afc30

Merge "libaudiohal: Fix handling of NULL replySize param to Effect::command"

media/libaudiohal/EffectHalHidl.cpp

diff --git a/media/libaudiohal/EffectHalHidl.cpp b/media/libaudiohal/EffectHalHidl.cpp
index 3fb2f43..2665719 100644
--- a/media/libaudiohal/EffectHalHidl.cpp
+++ b/media/libaudiohal/EffectHalHidl.cpp
@@ -171,6 +171,8 @@
         hidlData.setToExternal(reinterpret_cast<uint8_t*>(pCmdData), cmdSize);
     }
     status_t status;
+    uint32_t replySizeStub = 0;
+    if (replySize == nullptr) replySize = &replySizeStub;
     Return<void> ret = mEffect->command(cmdCode, hidlData, *replySize,
             [&](int32_t s, const hidl_vec<uint8_t>& result) {
                 status = s;