From b9d24aff61993f8e95b7d5fa405bd4b7f2d0fe7c Mon Sep 17 00:00:00 2001
From: wenbodong2015 <815611030@qq.com>
Date: Sat, 10 Jul 2021 23:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3at=5Fsocket=E5=9C=A8=E6=9E=81?=
 =?UTF-8?q?=E9=99=90=E6=83=85=E5=86=B5=E4=B8=8B=E5=86=85=E5=AD=98=E6=B3=84?=
 =?UTF-8?q?=E6=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AT模块在执行AT+CLOSE并返回OK后，在实际关闭前（上报URC前）仍然有
可能接收到数据。所以接收数据时需要判断状态是否为AT_SOCKET_CONNECT。

另，at_recv_notice_cb在拒绝数据包时，没有释放数据包内存，从而导致
内在泄漏。
---
 components/net/at/at_socket/at_socket.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c
index 46d158dabf..27d2101c79 100644
--- a/components/net/at/at_socket/at_socket.c
+++ b/components/net/at/at_socket/at_socket.c
@@ -652,14 +652,20 @@ static void at_recv_notice_cb(struct at_socket *sock, at_socket_evt_t event, con
     RT_ASSERT(event == AT_SOCKET_EVT_RECV);
 
     /* check the socket object status */
-    if (sock->magic != AT_SOCKET_MAGIC)
+    if (sock->magic != AT_SOCKET_MAGIC || sock->state != AT_SOCKET_CONNECT)
     {
+        rt_free((void *)buff);
         return;
     }
 
     /* put receive buffer to receiver packet list */
     rt_mutex_take(sock->recv_lock, RT_WAITING_FOREVER);
-    at_recvpkt_put(&(sock->recvpkt_list), buff, bfsz);
+    if (!at_recvpkt_put(&(sock->recvpkt_list), buff, bfsz))
+    {
+        rt_free((void *)buff);
+        rt_mutex_release(sock->recv_lock);
+        return;
+    }
     rt_mutex_release(sock->recv_lock);
 
     rt_sem_release(sock->recv_notice);