aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-25 14:27:38 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-08-25 14:27:38 +0000
commit3cfb3324623c681aed1e5373b17e9a3afb054e26 (patch)
treebff9e09662e48031173d1b269e463e025dc81e84
parent6d1581ac91c246fc9c820991eb690126a5d895a5 (diff)
parent9960e27329b79021d66b96e65f56f8248edb4a50 (diff)
downloadcuttlefish-3cfb3324623c681aed1e5373b17e9a3afb054e26.tar.gz
Snap for 10716635 from 9960e27329b79021d66b96e65f56f8248edb4a50 to mainline-neuralnetworks-releaseaml_neu_341010080aml_neu_341010000
Change-Id: I7b69a034203a4ba39e29a2438894d46ea5e1ea0f
-rw-r--r--guest/hals/ril/reference-ril/reference-ril.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/guest/hals/ril/reference-ril/reference-ril.c b/guest/hals/ril/reference-ril/reference-ril.c
index 9fdf80d3d..762f1e44e 100644
--- a/guest/hals/ril/reference-ril/reference-ril.c
+++ b/guest/hals/ril/reference-ril/reference-ril.c
@@ -845,8 +845,8 @@ static void requestOrSendDataCallList(int cid, RIL_Token *t)
p_cur = p_cur->p_next)
n++;
- RIL_Data_Call_Response_v11 *responses =
- alloca(n * sizeof(RIL_Data_Call_Response_v11));
+ RIL_Data_Call_Response_v11 *responses = (n == 0) ? NULL :
+ alloca(n * sizeof(RIL_Data_Call_Response_v11));
int i;
for (i = 0; i < n; i++) {
@@ -996,7 +996,7 @@ static void requestOrSendDataCallList(int cid, RIL_Token *t)
// If cid = -1, return the data call list without processing CGCONTRDP (setupDataCall)
if (cid == -1) {
if (t != NULL)
- RIL_onRequestComplete(*t, RIL_E_SUCCESS, &responses[0],
+ RIL_onRequestComplete(*t, RIL_E_SUCCESS, responses,
sizeof(RIL_Data_Call_Response_v11));
else
RIL_onUnsolicitedResponse(RIL_UNSOL_DATA_CALL_LIST_CHANGED, responses,