diff options
| author | sqian <shuoq@google.com> | 2017-09-05 11:51:45 -0700 |
|---|---|---|
| committer | sqian <shuoq@google.com> | 2017-09-05 15:30:54 -0700 |
| commit | 2075d7c51386fc8563d532cfcbfb14b7fde2ad90 (patch) | |
| tree | a54ce430aff0ddede8f5f1a2d5da655dd8b38f06 | |
| parent | c4a73f3899df2d91c27baf8e6737c58beffebe6a (diff) | |
| download | android_hardware_ril-2075d7c51386fc8563d532cfcbfb14b7fde2ad90.tar.gz android_hardware_ril-2075d7c51386fc8563d532cfcbfb14b7fde2ad90.tar.bz2 android_hardware_ril-2075d7c51386fc8563d532cfcbfb14b7fde2ad90.zip | |
Fix Sap Service
Because sapDecodeMessage can return NULL in its code logic, to check NULL
before its usage in processResponse might be necessary.
Bug: 65028505
Test: fuzzer
Change-Id: I27ee6ef99c495e29408c3c0d895cb8ee54d54173
| -rw-r--r-- | libril/sap_service.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libril/sap_service.cpp b/libril/sap_service.cpp index b9c7e58..ee04afb 100644 --- a/libril/sap_service.cpp +++ b/libril/sap_service.cpp @@ -775,6 +775,13 @@ void processResponse(MsgHeader *rsp, RilSapSocket *sapSocket, MsgType msgType) { return; } + if (messagePtr == NULL) { + RLOGE("processResponse: *messagePtr == NULL; msgId = %d; msgType = %d", + msgId, msgType); + sapImpl->sendFailedResponse(msgId, rsp->token, 0); + return; + } + RLOGD("processResponse: sapCallback != NULL; msgId = %d; msgType = %d", msgId, msgType); |