Merge pull request #12329 from jeromecoutant/PR_ATCELL

AT_CellularStack: crash during TCP test
ARMmbed · Feb 3, 2020 · 5863415 · 5863415
2 parents 62cc4ec + a1fb286
commit 5863415
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/features/cellular/framework/AT/AT_CellularStack.cpp b/features/cellular/framework/AT/AT_CellularStack.cpp
@@ -429,8 +429,10 @@ void AT_CellularStack::socket_attach(nsapi_socket_t handle, void (*callback)(voi
 int AT_CellularStack::get_socket_index_by_port(uint16_t port)
 {
     for (int i = 0; i < _device.get_property(AT_CellularDevice::PROPERTY_SOCKET_COUNT); i++) {
-        if (_socket[i]->localAddress.get_port() == port) {
-            return i;
+        if (_socket[i] != 0) {
+            if (_socket[i]->localAddress.get_port() == port) {
+                return i;
+            }
         }
     }
     return -1;