commit c5d02992b41eaacdf6caff28b0aaefee460e6674
author Linux Build Service Account <lnxbuild@localhost> Tue Nov 08 23:03:38 2022 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 08 23:03:38 2022 -0800
tree 0e577956a5a57d662cb41dd6be2cd4300f0bd24b
parent f98e05fdc6e7fc16c3d90925b7b5bac69ead34fb
parent 89da38b8d271b4ba67ebba84a1e6f94d2c12a170

Merge "ipc: Add null check before dereferencing agm client" into audio-platform-arintf.lnx.1.0.c10

ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp

diff --git a/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp b/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp
index 520a2af..9b2d1d0 100644
--- a/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp
+++ b/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp
@@ -451,6 +451,10 @@
         uint32_t num = (uint32_t) *num_aif_info;
         int ret = -EINVAL;
         android::sp<IAGM> agm_client = get_agm_server();
+
+        if (!agm_client) {
+            goto error_exit_fn;
+        }
         auto status = agm_client->ipc_agm_get_aif_info_list(num,[&](int32_t _ret,
                                             hidl_vec<AifInfo> aif_list_ret_hidl,
                                             uint32_t num_aif_info_hidl )
@@ -475,6 +479,7 @@
         }
         return ret;
     }
+error_exit_fn:
     return -EINVAL;
 }