espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/tw14823_lwip_assert_err' into 'master'

Browse Source 
assert when close a connecting socket

See merge request !1136
This commit is contained in:
Jiang Jiang Jian
2017-08-24 11:29:32 +08:00
parent d42208ffe8 61f64e38d9
commit 72a6b26244
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/lwip/api/api_msg.c
View File

@@ -1026,9 +1026,12 @@ lwip_netconn_do_delconn(void *m)
} else } else
#endif /* LWIP_NETCONN_FULLDUPLEX */ #endif /* LWIP_NETCONN_FULLDUPLEX */
{ {
LWIP_ASSERT("blocking connect in progress", if (!(state != NETCONN_CONNECT || IN_NONBLOCKING_CONNECT(msg->conn))) {
(state != NETCONN_CONNECT) || IN_NONBLOCKING_CONNECT(msg->conn)); msg->err = ERR_INPROGRESS;
msg->err = ERR_OK; NETCONN_SET_SAFE_ERR(msg->conn, ERR_INPROGRESS);
LWIP_DEBUGF(API_MSG_DEBUG, ("netconn error:ERR_INPROGRESS\n"));
return;
}
/* Drain and delete mboxes */ /* Drain and delete mboxes */
netconn_drain(msg->conn); netconn_drain(msg->conn);