From 52e92cd3edcbadd157f09d0a467be77b3a09d53a Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Sun, 12 Sep 2021 02:46:36 +0800
Subject: [PATCH] [TD-6416]<fix>: fixed memory leak and crash bug

---
 src/client/src/tscAsync.c         | 10 +++++++++-
 src/plugins/http/src/httpHandle.c |  1 +
 src/plugins/http/src/httpParser.c |  4 ----
 src/plugins/http/src/httpResp.c   |  2 ++
 src/plugins/http/src/httpServer.c |  8 +++++---
 src/plugins/http/src/httpSql.c    |  1 -
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 6b12cd0da0..4a621d47c0 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -60,17 +60,25 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, __async_cb_func_t fp, void* para
   tscDebugL("0x%"PRIx64" SQL: %s", pSql->self, pSql->sqlstr);
   pCmd->resColumnId = TSDB_RES_COL_ID;
 
+  taosAcquireRef(tscObjRef, pSql->self);
+
   int32_t code = tsParseSql(pSql, true);
-  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) return;
+
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    taosReleaseRef(tscObjRef, pSql->self);
+    return;
+  }
   
   if (code != TSDB_CODE_SUCCESS) {
     pSql->res.code = code;
     tscAsyncResultOnError(pSql);
+    taosReleaseRef(tscObjRef, pSql->self);
     return;
   }
 
   SQueryInfo* pQueryInfo = tscGetQueryInfo(pCmd);
   executeQuery(pSql, pQueryInfo);
+  taosReleaseRef(tscObjRef, pSql->self);
 }
 
 // TODO return the correct error code to client in tscQueueAsyncError
diff --git a/src/plugins/http/src/httpHandle.c b/src/plugins/http/src/httpHandle.c
index d51c774ff2..9719d93824 100644
--- a/src/plugins/http/src/httpHandle.c
+++ b/src/plugins/http/src/httpHandle.c
@@ -35,6 +35,7 @@ bool httpProcessData(HttpContext* pContext) {
   if (!httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_HANDLING)) {
     httpTrace("context:%p, fd:%d, state:%s not in ready state, stop process request", pContext, pContext->fd,
               httpContextStateStr(pContext->state));
+    pContext->error = true;
     httpCloseContextByApp(pContext);
     return false;
   }
diff --git a/src/plugins/http/src/httpParser.c b/src/plugins/http/src/httpParser.c
index 62b1737f6f..7066f19769 100644
--- a/src/plugins/http/src/httpParser.c
+++ b/src/plugins/http/src/httpParser.c
@@ -1157,10 +1157,6 @@ static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
     httpOnError(parser, HTTP_CODE_INTERNAL_SERVER_ERROR, TSDB_CODE_HTTP_PARSE_ERROR_STATE);
   }
 
-  if (ok != 0) {
-    pContext->error = true;
-  }
-
   return ok;
 }
 
diff --git a/src/plugins/http/src/httpResp.c b/src/plugins/http/src/httpResp.c
index 79e728dd45..1d05b455cb 100644
--- a/src/plugins/http/src/httpResp.c
+++ b/src/plugins/http/src/httpResp.c
@@ -147,6 +147,8 @@ void httpSendErrorResp(HttpContext *pContext, int32_t errNo) {
     httpCode = pContext->parser->httpCode;
   }
 
+  pContext->error = true;
+
   char *httpCodeStr = httpGetStatusDesc(httpCode);
   httpSendErrorRespImp(pContext, httpCode, httpCodeStr, errNo & 0XFFFF, tstrerror(errNo));
 }
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index f02859f165..13a0835c39 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -191,8 +191,6 @@ static void httpProcessHttpData(void *param) {
         if (httpReadData(pContext)) {
           (*(pThread->processData))(pContext);
           atomic_fetch_add_32(&pServer->requestNum, 1);
-        } else {
-          httpReleaseContext(pContext/*, false*/);
         }
       }
     }
@@ -402,13 +400,17 @@ static bool httpReadData(HttpContext *pContext) {
     } else if (nread < 0) {
       if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
         httpDebug("context:%p, fd:%d, read from socket error:%d, wait another event", pContext, pContext->fd, errno);
-        return false;  // later again
+        continue;  // later again
       } else {
         httpError("context:%p, fd:%d, read from socket error:%d, close connect", pContext, pContext->fd, errno);
+        taosCloseSocket(pContext->fd);
+        httpReleaseContext(pContext/*, false */);
         return false;
       }
     } else {
       httpError("context:%p, fd:%d, nread:%d, wait another event", pContext, pContext->fd, nread);
+      taosCloseSocket(pContext->fd);
+      httpReleaseContext(pContext/*, false */);
       return false;
     }
   }
diff --git a/src/plugins/http/src/httpSql.c b/src/plugins/http/src/httpSql.c
index 0dd451f72d..602767a656 100644
--- a/src/plugins/http/src/httpSql.c
+++ b/src/plugins/http/src/httpSql.c
@@ -405,7 +405,6 @@ void httpProcessRequestCb(void *param, TAOS_RES *result, int32_t code) {
 
   if (pContext->session == NULL) {
     httpSendErrorResp(pContext, TSDB_CODE_HTTP_SESSION_FULL);
-    httpCloseContextByApp(pContext);
   } else {
     httpExecCmd(pContext);
   }
-- 
GitLab