Fixes a serial mutex acquicition bug

ARMmbed · Nov 9, 2018 · 483ba89 · 483ba89
1 parent ac4384c
commit 483ba89
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ESP8266/ESP8266.cpp b/ESP8266/ESP8266.cpp
@@ -624,13 +624,16 @@ int32_t ESP8266::_recv_tcp_passive(int id, void *data, uint32_t amount, uint32_t
 {
     int32_t ret;
 
+    _smutex.lock();
+
+    _process_oob(timeout, true);
+
     // return immediately if no data is available
-    if (_sock_i[id].tcp_data_avbl == 0) {
+    if (_sock_i[id].tcp_data_avbl == 0 && _sock_i[id].open) {
+        _smutex.unlock();
         return NSAPI_ERROR_WOULD_BLOCK;
     }
 
-    _smutex.lock();
-
     _sock_i[id].tcp_data = (char*)data;
     _sock_i[id].tcp_data_rcvd = NSAPI_ERROR_WOULD_BLOCK;
     _sock_active_id = id;