From 61f64e38d93ee86d9c3a7997e9ff2f6f2287de96 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Mon, 21 Aug 2017 16:32:50 +0800 Subject: [PATCH] assert when close a connecting socket --- components/lwip/api/api_msg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/components/lwip/api/api_msg.c b/components/lwip/api/api_msg.c index b49d26041d..bfb07b876a 100755 --- a/components/lwip/api/api_msg.c +++ b/components/lwip/api/api_msg.c @@ -1026,9 +1026,12 @@ lwip_netconn_do_delconn(void *m) } else #endif /* LWIP_NETCONN_FULLDUPLEX */ { - LWIP_ASSERT("blocking connect in progress", - (state != NETCONN_CONNECT) || IN_NONBLOCKING_CONNECT(msg->conn)); - msg->err = ERR_OK; + if (!(state != NETCONN_CONNECT || IN_NONBLOCKING_CONNECT(msg->conn))) { + msg->err = ERR_INPROGRESS; + NETCONN_SET_SAFE_ERR(msg->conn, ERR_INPROGRESS); + LWIP_DEBUGF(API_MSG_DEBUG, ("netconn error:ERR_INPROGRESS\n")); + return; + } /* Drain and delete mboxes */ netconn_drain(msg->conn);