diff options
| author | Taiyab Haque <thaque@codeaurora.org> | 2016-01-18 08:47:27 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-16 02:40:45 -0700 |
| commit | 8d51a5465bbcba4e65e0ee6192ad5c32c39d3c3d (patch) | |
| tree | e1a92f206d802878151d2617119d3fff8af9a2c8 | |
| parent | eb67a6f599afc1a85e541ba7b5bd58ea10dd6f7b (diff) | |
| download | android_hardware_ril-8d51a5465bbcba4e65e0ee6192ad5c32c39d3c3d.tar.gz android_hardware_ril-8d51a5465bbcba4e65e0ee6192ad5c32c39d3c3d.tar.bz2 android_hardware_ril-8d51a5465bbcba4e65e0ee6192ad5c32c39d3c3d.zip | |
ril: SAP_DISCONNECT response length will be zero
SAP_DISCONNECT response length will be zero, so
onRequestComplete() handler should not have a
check for length.
CRs-Fixed: 960285
Change-Id: I676ec8a0467268d1f13abc9fea54fb6db18faa3d
| -rw-r--r-- | libril/RilSapSocket.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libril/RilSapSocket.cpp b/libril/RilSapSocket.cpp index e422f34..bcbe376 100644 --- a/libril/RilSapSocket.cpp +++ b/libril/RilSapSocket.cpp @@ -300,25 +300,26 @@ void RilSapSocket::onRequestComplete(RIL_Token t, RIL_Errno e, void *response, SapSocketRequest* request= (SapSocketRequest*)t; MsgHeader *hdr = request->curr; - if (response && response_len > 0) { - MsgHeader rsp; - rsp.token = request->curr->token; - rsp.type = MsgType_RESPONSE; - rsp.id = request->curr->id; - rsp.error = (Error)e; - rsp.payload = (pb_bytes_array_t *)calloc(1, + MsgHeader rsp; + rsp.token = request->curr->token; + rsp.type = MsgType_RESPONSE; + rsp.id = request->curr->id; + rsp.error = (Error)e; + rsp.payload = (pb_bytes_array_t *)calloc(1, sizeof(pb_bytes_array_t) + response_len); - if (!rsp.payload) { - RLOGE("onRequestComplete: OOM"); - } else { + if (!rsp.payload) { + RLOGE("onRequestComplete: OOM"); + } else { + if (response && response_len > 0) { memcpy(rsp.payload->bytes, response, response_len); - rsp.payload->size = response_len; + } - RLOGE("Token:%d, MessageId:%d", hdr->token, hdr->id); + rsp.payload->size = response_len; - sendResponse(&rsp); - free(rsp.payload); - } + RLOGE("Token:%d, MessageId:%d", hdr->token, hdr->id); + + sendResponse(&rsp); + free(rsp.payload); } // Deallocate SapSocketRequest |