Merge pull request #28745 from taosdata/enh/TD-32167/query

enh: param valid, query

include/util/tjson.h

@@ -25,7 +25,7 @@ extern "C" {
 
 #define tjsonGetNumberValue(pJson, pName, val, code) \
   do {                                               \
-    uint64_t _tmp = 0;                               \
+    int64_t _tmp = 0;                                \
     code = tjsonGetBigIntValue(pJson, pName, &_tmp); \
     val = _tmp;                                      \
   } while (0)

source/libs/qcom/inc/queryInt.h

@@ -23,7 +23,13 @@ extern "C" {
 #define VALIDNUMOFCOLS(x) ((x) >= TSDB_MIN_COLUMNS && (x) <= TSDB_MAX_COLUMNS)
 #define VALIDNUMOFTAGS(x) ((x) >= 0 && (x) <= TSDB_MAX_TAGS)
 
-
+#define QUERY_PARAM_CHECK(_p)                                                \
+  do {                                                                       \
+    if ((_p) == NULL) {                                                      \
+      qError("function:%s, param invalid, line:%d", __FUNCTION__, __LINE__); \
+      return TSDB_CODE_TSC_INVALID_INPUT;                                    \
+    }                                                                        \
+  } while (0)
 
 #ifdef __cplusplus
 }

source/libs/qcom/src/queryUtil.c

@@ -59,6 +59,9 @@ const SSchema* tGetTbnameColumnSchema() {
 }
 
 static bool doValidateSchema(SSchema* pSchema, int32_t numOfCols, int32_t maxLen) {
+  if (!pSchema) {
+    return false;
+  }
   int32_t rowLen = 0;
 
   for (int32_t i = 0; i < numOfCols; ++i) {
@@ -100,7 +103,7 @@ static bool doValidateSchema(SSchema* pSchema, int32_t numOfCols, int32_t maxLen
 }
 
 bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTags) {
-  if (!VALIDNUMOFCOLS(numOfCols)) {
+  if (!pSchema || !VALIDNUMOFCOLS(numOfCols)) {
     return false;
   }
 
@@ -127,6 +130,7 @@ bool tIsValidSchema(struct SSchema* pSchema, int32_t numOfCols, int32_t numOfTag
 static STaskQueue taskQueue = {0};
 
 static void processTaskQueue(SQueueInfo *pInfo, SSchedMsg *pSchedMsg) {
+  if(!pSchedMsg || !pSchedMsg->ahandle) return;
   __async_exec_fn_t execFn = (__async_exec_fn_t)pSchedMsg->ahandle;
   (void)execFn(pSchedMsg->thandle);
   taosFreeQitem(pSchedMsg);
@@ -206,6 +210,10 @@ void destroyAhandle(void *ahandle) {
 
 int32_t asyncSendMsgToServerExt(void* pTransporter, SEpSet* epSet, int64_t* pTransporterId, SMsgSendInfo* pInfo,
                                 bool persistHandle, void* rpcCtx) {                         
+  QUERY_PARAM_CHECK(pTransporter);
+  QUERY_PARAM_CHECK(epSet);
+  QUERY_PARAM_CHECK(pInfo);
+
   char* pMsg = rpcMallocCont(pInfo->msgInfo.len);
   if (NULL == pMsg) {
     qError("0x%" PRIx64 " msg:%s malloc failed", pInfo->requestId, TMSG_INFO(pInfo->msgType));
@@ -236,6 +244,7 @@ int32_t asyncSendMsgToServer(void* pTransporter, SEpSet* epSet, int64_t* pTransp
   return asyncSendMsgToServerExt(pTransporter, epSet, pTransporterId, pInfo, false, NULL);
 }
 int32_t asyncFreeConnById(void* pTransporter, int64_t pid) {
+  QUERY_PARAM_CHECK(pTransporter);
   return rpcFreeConnById(pTransporter, pid);
 }
 
@@ -314,6 +323,8 @@ void destroyQueryExecRes(SExecResult* pRes) {
 }
 // clang-format on
 int32_t dataConverToStr(char* str, int64_t capacity, int type, void* buf, int32_t bufSize, int32_t* len) {
+  QUERY_PARAM_CHECK(str);
+  QUERY_PARAM_CHECK(buf);
   int32_t n = 0;
 
   switch (type) {
@@ -420,6 +431,10 @@ int32_t dataConverToStr(char* str, int64_t capacity, int type, void* buf, int32_
 }
 
 void parseTagDatatoJson(void* p, char** jsonStr) {
+  if (!p || !jsonStr) {
+    qError("parseTagDatatoJson invalid input, line:%d", __LINE__);
+    return;
+  }
   char*   string = NULL;
   SArray* pTagVals = NULL;
   cJSON*  json = NULL;
@@ -520,6 +535,7 @@ end:
 }
 
 int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst) {
+  QUERY_PARAM_CHECK(pDst);
   if (NULL == pSrc) {
     *pDst = NULL;
     return TSDB_CODE_SUCCESS;
@@ -553,6 +569,7 @@ int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst) {
 }
 
 void getColumnTypeFromMeta(STableMeta* pMeta, char* pName, ETableColumnType* pType) {
+  if(!pMeta || !pName || !pType) return;
   int32_t nums = pMeta->tableInfo.numOfTags + pMeta->tableInfo.numOfColumns;
   for (int32_t i = 0; i < nums; ++i) {
     if (0 == strcmp(pName, pMeta->schema[i].name)) {
@@ -576,6 +593,7 @@ void freeVgInfo(SDBVgInfo* vgInfo) {
 }
 
 int32_t cloneDbVgInfo(SDBVgInfo* pSrc, SDBVgInfo** pDst) {
+  QUERY_PARAM_CHECK(pDst);
   if (NULL == pSrc) {
     *pDst = NULL;
     return TSDB_CODE_SUCCESS;
@@ -617,6 +635,7 @@ int32_t cloneDbVgInfo(SDBVgInfo* pSrc, SDBVgInfo** pDst) {
 }
 
 int32_t cloneSVreateTbReq(SVCreateTbReq* pSrc, SVCreateTbReq** pDst) {
+  QUERY_PARAM_CHECK(pDst);
   if (NULL == pSrc) {
     *pDst = NULL;
     return TSDB_CODE_SUCCESS;

source/libs/qcom/src/querymsg.c

@@ -29,6 +29,8 @@ int32_t (*queryBuildMsg[TDMT_MAX])(void *input, char **msg, int32_t msgSize, int
 int32_t (*queryProcessMsgRsp[TDMT_MAX])(void *output, char *msg, int32_t msgSize) = {0};
 
 int32_t queryBuildUseDbOutput(SUseDbOutput *pOut, SUseDbRsp *usedbRsp) {
+  QUERY_PARAM_CHECK(pOut);
+  QUERY_PARAM_CHECK(usedbRsp);
   memcpy(pOut->db, usedbRsp->db, TSDB_DB_FNAME_LEN);
   pOut->dbId = usedbRsp->uid;
 
@@ -71,10 +73,10 @@ int32_t queryBuildUseDbOutput(SUseDbOutput *pOut, SUseDbRsp *usedbRsp) {
 
 int32_t queryBuildTableMetaReqMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen,
                                   void *(*mallcFp)(int64_t)) {
+  QUERY_PARAM_CHECK(input);
+  QUERY_PARAM_CHECK(msg);
+  QUERY_PARAM_CHECK(msgLen);
   SBuildTableInput *pInput = input;
-  if (NULL == input || NULL == msg || NULL == msgLen) {
-    return TSDB_CODE_TSC_INVALID_INPUT;
-  }
 
   STableInfoReq infoReq = {0};
   infoReq.option = pInput->option;
@@ -101,10 +103,10 @@ int32_t queryBuildTableMetaReqMsg(void *input, char **msg, int32_t msgSize, int3
 }
 
 int32_t queryBuildUseDbMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
+  QUERY_PARAM_CHECK(input);
+  QUERY_PARAM_CHECK(msg);
+  QUERY_PARAM_CHECK(msgLen);
   SBuildUseDBInput *pInput = input;
-  if (NULL == pInput || NULL == msg || NULL == msgLen) {
-    return TSDB_CODE_TSC_INVALID_INPUT;
-  }
 
   SUseDbReq usedbReq = {0};
   tstrncpy(usedbReq.db, pInput->db, TSDB_DB_FNAME_LEN);
@@ -131,9 +133,8 @@ int32_t queryBuildUseDbMsg(void *input, char **msg, int32_t msgSize, int32_t *ms
 }
 
 int32_t queryBuildQnodeListMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(msg);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msgLen);
-  }
 
   SQnodeListReq qnodeListReq = {0};
   qnodeListReq.rowNum = -1;
@@ -155,9 +156,8 @@ int32_t queryBuildQnodeListMsg(void *input, char **msg, int32_t msgSize, int32_t
 }
 
 int32_t queryBuildDnodeListMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(msg);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msgLen);
-  }
 
   SDnodeListReq dnodeListReq = {0};
   dnodeListReq.rowNum = -1;
@@ -179,9 +179,8 @@ int32_t queryBuildDnodeListMsg(void *input, char **msg, int32_t msgSize, int32_t
 }
 
 int32_t queryBuildGetSerVerMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(msg);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msgLen);
-  }
 
   SServerVerReq req = {0};
 
@@ -202,9 +201,9 @@ int32_t queryBuildGetSerVerMsg(void *input, char **msg, int32_t msgSize, int32_t
 }
 
 int32_t queryBuildGetDBCfgMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   SDbCfgReq dbCfgReq = {0};
   tstrncpy(dbCfgReq.db, input, TSDB_DB_FNAME_LEN);
@@ -226,9 +225,9 @@ int32_t queryBuildGetDBCfgMsg(void *input, char **msg, int32_t msgSize, int32_t
 }
 
 int32_t queryBuildGetIndexMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   SUserIndexReq indexReq = {0};
   tstrncpy(indexReq.indexFName, input, TSDB_INDEX_FNAME_LEN);
@@ -251,9 +250,9 @@ int32_t queryBuildGetIndexMsg(void *input, char **msg, int32_t msgSize, int32_t
 
 int32_t queryBuildRetrieveFuncMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen,
                                   void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   SRetrieveFuncReq funcReq = {0};
   funcReq.numOfFuncs = 1;
@@ -288,9 +287,9 @@ int32_t queryBuildRetrieveFuncMsg(void *input, char **msg, int32_t msgSize, int3
 }
 
 int32_t queryBuildGetUserAuthMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   SGetUserAuthReq req = {0};
   tstrncpy(req.user, input, TSDB_USER_LEN);
@@ -311,9 +310,9 @@ int32_t queryBuildGetUserAuthMsg(void *input, char **msg, int32_t msgSize, int32
 }
 
 int32_t queryBuildGetTbIndexMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   STableIndexReq indexReq = {0};
   tstrncpy(indexReq.tbFName, input, TSDB_TABLE_FNAME_LEN);
@@ -335,9 +334,9 @@ int32_t queryBuildGetTbIndexMsg(void *input, char **msg, int32_t msgSize, int32_
 }
 
 int32_t queryBuildGetTbCfgMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   SBuildTableInput *pInput = input;
   STableCfgReq      cfgReq = {0};
@@ -362,9 +361,9 @@ int32_t queryBuildGetTbCfgMsg(void *input, char **msg, int32_t msgSize, int32_t
 }
 
 int32_t queryBuildGetViewMetaMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen, void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   SViewMetaReq req = {0};
   tstrncpy(req.fullname, input, TSDB_VIEW_FNAME_LEN);
@@ -387,9 +386,9 @@ int32_t queryBuildGetViewMetaMsg(void *input, char **msg, int32_t msgSize, int32
 
 int32_t queryBuildGetTableTSMAMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen,
                                   void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   STableTSMAInfoReq req = {0};
   tstrncpy(req.name, input, TSDB_TABLE_FNAME_LEN);
@@ -411,9 +410,9 @@ int32_t queryBuildGetTableTSMAMsg(void *input, char **msg, int32_t msgSize, int3
 
 int32_t queryBuildGetTSMAMsg(void *input, char **msg, int32_t msgSize, int32_t *msgLen,
                                   void *(*mallcFp)(int64_t)) {
-  if (NULL == msg || NULL == msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   STableTSMAInfoReq req = {0};
   req.fetchingWithTsmaName = true;
@@ -436,9 +435,9 @@ int32_t queryBuildGetTSMAMsg(void *input, char **msg, int32_t msgSize, int32_t *
 }
 
 int32_t queryBuildGetStreamProgressMsg(void* input, char** msg, int32_t msgSize, int32_t *msgLen, void*(*mallcFp)(int64_t)) {
-  if (!msg || !msgLen) {
+  QUERY_PARAM_CHECK(input);
-    return TSDB_CODE_TSC_INVALID_INPUT;
+  QUERY_PARAM_CHECK(msg);
-  }
+  QUERY_PARAM_CHECK(msgLen);
 
   int32_t len = tSerializeStreamProgressReq(NULL, 0, input);
   void* pBuf = (*mallcFp)(len);
@@ -504,6 +503,7 @@ PROCESS_USEDB_OVER:
 }
 
 static int32_t queryConvertTableMetaMsg(STableMetaRsp *pMetaMsg) {
+  QUERY_PARAM_CHECK(pMetaMsg);
   if (pMetaMsg->numOfTags < 0 || pMetaMsg->numOfTags > TSDB_MAX_TAGS) {
     qError("invalid numOfTags[%d] in table meta rsp msg", pMetaMsg->numOfTags);
     return TSDB_CODE_TSC_INVALID_VALUE;
@@ -539,6 +539,8 @@ static int32_t queryConvertTableMetaMsg(STableMetaRsp *pMetaMsg) {
 }
 
 int32_t queryCreateCTableMetaFromMsg(STableMetaRsp *msg, SCTableMeta *pMeta) {
+  QUERY_PARAM_CHECK(msg);
+  QUERY_PARAM_CHECK(pMeta);
   pMeta->vgId = msg->vgId;
   pMeta->tableType = msg->tableType;
   pMeta->uid = msg->tuid;
@@ -551,6 +553,8 @@ int32_t queryCreateCTableMetaFromMsg(STableMetaRsp *msg, SCTableMeta *pMeta) {
 }
 
 int32_t queryCreateTableMetaFromMsg(STableMetaRsp *msg, bool isStb, STableMeta **pMeta) {
+  QUERY_PARAM_CHECK(msg);
+  QUERY_PARAM_CHECK(pMeta);
   int32_t total = msg->numOfColumns + msg->numOfTags;
   int32_t metaSize = sizeof(STableMeta) + sizeof(SSchema) * total;
   int32_t schemaExtSize = (useCompress(msg->tableType) && msg->pSchemaExt) ? sizeof(SSchemaExt) * msg->numOfColumns : 0;
@@ -605,6 +609,8 @@ int32_t queryCreateTableMetaFromMsg(STableMetaRsp *msg, bool isStb, STableMeta *
 }
 
 int32_t queryCreateTableMetaExFromMsg(STableMetaRsp *msg, bool isStb, STableMeta **pMeta) {
+  QUERY_PARAM_CHECK(msg);
+  QUERY_PARAM_CHECK(pMeta);
   int32_t total = msg->numOfColumns + msg->numOfTags;
   int32_t metaSize = sizeof(STableMeta) + sizeof(SSchema) * total;
   int32_t schemaExtSize = (useCompress(msg->tableType) && msg->pSchemaExt) ? sizeof(SSchemaExt) * msg->numOfColumns : 0;