MbedClient: improving logic of readSocket

andreagilardoni · andreagilardoni · commit 44147622cccf · 2024-04-23T11:34:36.000+02:00
diff --git a/libraries/SocketWrapper/src/MbedClient.cpp b/libraries/SocketWrapper/src/MbedClient.cpp
@@ -19,12 +19,12 @@ void arduino::MbedClient::readSocket() {
     uint8_t data[SOCKET_BUFFER_SIZE];
     int ret = NSAPI_ERROR_WOULD_BLOCK;
     do {
-      if (rxBuffer.availableForStore() == 0) {
+      mutex->lock();
+      if (sock != nullptr && rxBuffer.availableForStore() == 0) {
+        mutex->unlock();
         yield();
         continue;
-      }
-      mutex->lock();
-      if (sock == nullptr) {
+      } else if (sock == nullptr) {
         goto cleanup;
       }
       ret = sock->recv(data, rxBuffer.availableForStore());
