commit f6b6550f24f9b531b0050cf05d962de7dcbf8523
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 12 20:35:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 12 20:35:37 2018 +0000
tree 557191ec1f78437edda48c37d446577dec76d645
parent 236f668034f272ac2e5c20753f3bb437fb50cae1
parent 31067484c2130d72e5022db1caaeab40e2312bd1

Merge "libril: Protect against NULL unsolicited response function"

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 514ac90..fbf7ee0 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -792,9 +792,11 @@
         assert(rwlockRet == 0);
     }
 
-    ret = s_unsolResponses[unsolResponseIndex].responseFunction(
-            (int) soc_id, responseType, 0, RIL_E_SUCCESS, const_cast<void*>(data),
-            datalen);
+    if (s_unsolResponses[unsolResponseIndex].responseFunction) {
+        ret = s_unsolResponses[unsolResponseIndex].responseFunction(
+                (int) soc_id, responseType, 0, RIL_E_SUCCESS, const_cast<void*>(data),
+                datalen);
+    }
 
     rwlockRet = pthread_rwlock_unlock(radioServiceRwlockPtr);
     assert(rwlockRet == 0);