fix: harden code

Fixes #87.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
Co-Authored-by: raphael valentin <raphaelvalentin@users.noreply.github.com>

Author: fpistm

src/EthernetClient.cpp

@@ -186,16 +186,18 @@ void EthernetClient::flush()
 
 void EthernetClient::stop()
 {
-  if (_tcp_client == NULL) {
-    return;
-  }
-
-  // close tcp connection if not closed yet
-  if (status() != TCP_CLOSING) {
-    tcp_connection_close(_tcp_client->pcb, _tcp_client);
+  if (_tcp_client != NULL) {
+    // close tcp connection if not closed yet
+    if (status() != TCP_CLOSING) {
+      if (_tcp_client->pcb == NULL) {
+        _tcp_client->state = TCP_CLOSING;
+      } else {
+        tcp_connection_close(_tcp_client->pcb, _tcp_client);
+      }
+    }
+    mem_free(_tcp_client);
+    _tcp_client = NULL;
   }
-  mem_free(_tcp_client);
-  _tcp_client = NULL;
 }
 
 uint8_t EthernetClient::connected()

src/utility/stm32_eth.cpp

@@ -1079,7 +1079,9 @@ void tcp_connection_close(struct tcp_pcb *tpcb, struct tcp_struct *tcp)
   tcp_accept(tpcb, NULL);
 
   /* close tcp connection */
-  tcp_close(tpcb);
+  if (tcp_close(tpcb) != ERR_OK) {
+    tcp_abort(tpcb);
+  }
 
   tcp->pcb = NULL;
   tcp->state = TCP_CLOSING;