Fix crash by checking for NULL token at the beginning of RIL_onRequestComplete

 - RILD crashes when token is NULL because no NULL check at the beginning

diff --git a/libril/ril.cpp b/libril/ril.cpp
index a25d536..6b3fc6c 100644 (file)
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -4018,6 +4018,11 @@ RIL_onRequestComplete(RIL_Token t, RIL_Errno e, void *response, size_t responsel
 
     pRI = (RequestInfo *)t;
 
+    if (!checkAndDequeueRequestInfo(pRI)) {
+        RLOGE ("RIL_onRequestComplete: invalid RIL_Token");
+        return;
+    }
+
     socket_id = pRI->socket_id;
 #if (SIM_COUNT >= 2)
     if (socket_id == RIL_SOCKET_2) {
@@ -4036,11 +4041,6 @@ RIL_onRequestComplete(RIL_Token t, RIL_Errno e, void *response, size_t responsel
 #endif
     RLOGD("RequestComplete, %s", rilSocketIdToString(socket_id));
 
-    if (!checkAndDequeueRequestInfo(pRI)) {
-        RLOGE ("RIL_onRequestComplete: invalid RIL_Token");
-        return;
-    }
-
     if (pRI->local > 0) {
         // Locally issued command...void only!
         // response does not go back up the command socket