commit 3da9ac0051f30c7490ea28e8ea538ec7384ef2d9
author Amit Mahajan <amitmahajan@google.com> Mon Feb 13 13:41:28 2017 -0800
committer Amit Mahajan <amitmahajan@google.com> Mon Feb 13 13:51:20 2017 -0800
tree b5f53a331cd31344930339490cb05c8b0862cd4d
parent cf2c38113cb985787e2cfb3e68b314cc5925001b

Fix to handle hidl_string correctly in error scenarios.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: If638839043923975b047cbd086146e64a8c73d99

libril/ril_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index e93c75d..dd2f5fb 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -2520,10 +2520,9 @@
     RLOGD("radio::getSignalStrengthResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
-        SignalStrength signalStrength;
-        memset(&signalStrength, 0, sizeof(SignalStrength));
+        SignalStrength signalStrength = {};
         if (response == NULL || responseLen != sizeof(RIL_SignalStrength_v10)) {
             RLOGE("radio::getSignalStrengthResponse: Invalid response");
             if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
@@ -2766,14 +2765,19 @@
     RLOGD("radio::setupDataCallResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
 
-        SetupDataCallResult result;
+        SetupDataCallResult result = {};
         if (response == NULL || responseLen != sizeof(RIL_Data_Call_Response_v11)) {
             RLOGE("radio::setupDataCallResponse: Invalid response");
             if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
-            memset(&result, 0, sizeof(SetupDataCallResult));
+            result.type = hidl_string();
+            result.ifname = hidl_string();
+            result.addresses = hidl_string();
+            result.dnses = hidl_string();
+            result.gateways = hidl_string();
+            result.pcscf = hidl_string();
         } else {
             convertRilDataCallToHal((RIL_Data_Call_Response_v11 *) response, result);
         }
@@ -3397,7 +3401,7 @@
     RLOGD("radio::getDataCallListResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
 
         hidl_vec<SetupDataCallResult> ret;
@@ -4319,7 +4323,7 @@
     RLOGD("radio::reportStkServiceIsRunningResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
         Return<void> retStatus = radioService[slotId]->mRadioResponse->
                 reportStkServiceIsRunningResponse(responseInfo);
@@ -4443,7 +4447,7 @@
     RLOGD("radio::getCellInfoListResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
 
         hidl_vec<CellInfo> ret;
@@ -4768,7 +4772,7 @@
     RLOGD("radio::getHardwareConfigResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
 
         hidl_vec<HardwareConfig> result;
@@ -4854,7 +4858,7 @@
     if (response == NULL || responseLen != sizeof(RadioCapability)) {
         RLOGE("responseRadioCapability: Invalid response");
         if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
-        memset(&rc, 0, sizeof(RadioCapability));
+        rc.logicalModemUuid = hidl_string();
     } else {
         convertRilRadioCapabilityToHal(response, responseLen, rc);
     }
@@ -4866,8 +4870,8 @@
     RLOGD("radio::getRadioCapabilityResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
-        RadioCapability result;
+        RadioResponseInfo responseInfo = {};
+        RadioCapability result = {};
         responseRadioCapability(responseInfo, serial, responseType, e, response, responseLen,
                 result);
         Return<void> retStatus = radioService[slotId]->mRadioResponse->getRadioCapabilityResponse(
@@ -4886,8 +4890,8 @@
     RLOGD("radio::setRadioCapabilityResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
-        RadioCapability result;
+        RadioResponseInfo responseInfo = {};
+        RadioCapability result = {};
         responseRadioCapability(responseInfo, serial, responseType, e, response, responseLen,
                 result);
         Return<void> retStatus = radioService[slotId]->mRadioResponse->setRadioCapabilityResponse(
@@ -4964,14 +4968,13 @@
     RLOGD("radio::pullLceDataResponse: serial %d", serial);
 
     if (radioService[slotId]->mRadioResponse != NULL) {
-        RadioResponseInfo responseInfo;
+        RadioResponseInfo responseInfo = {};
         populateResponseInfo(responseInfo, serial, responseType, e);
 
-        LceDataInfo result;
+        LceDataInfo result = {};
         if (response == NULL || responseLen != sizeof(RIL_LceDataInfo)) {
             RLOGE("radio::pullLceDataResponse: Invalid response");
             if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
-            memset(&result, 0, sizeof(RIL_LceDataInfo));
         } else {
             convertRilLceDataInfoToHal(response, responseLen, result);
         }