From f5dacec38d9e3fb2fafeef28b531c6a9341b3f47 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 12 Jun 2022 00:08:01 +0800
Subject: [PATCH] fix(query): add more check for timestamp in converting.

---
 source/common/src/ttime.c               | 22 +++++++++++-----------
 source/libs/function/src/builtinsimpl.c |  6 ++++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c
index d2ee289cda..afae6b860c 100644
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@@ -76,22 +76,22 @@ void           deltaToUtcInitOnce() {
 
 static int64_t parseFraction(char* str, char** end, int32_t timePrec);
 static int32_t parseTimeWithTz(const char* timestr, int64_t* time, int32_t timePrec, char delim);
-static int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec);
-static int32_t parseLocaltimeDst(char* timestr, int64_t* time, int32_t timePrec);
+static int32_t parseLocaltime(char* timestr, int32_t len, int64_t* utime, int32_t timePrec);
+static int32_t parseLocaltimeDst(char* timestr, int32_t len, int64_t* utime, int32_t timePrec);
 static char*   forwardToTimeStringEnd(char* str);
 static bool    checkTzPresent(const char* str, int32_t len);
 
-static int32_t (*parseLocaltimeFp[])(char* timestr, int64_t* time, int32_t timePrec) = {parseLocaltime,
+static int32_t (*parseLocaltimeFp[])(char* timestr, int32_t len, int64_t* utime, int32_t timePrec) = {parseLocaltime,
                                                                                         parseLocaltimeDst};
 
-int32_t taosParseTime(const char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t day_light) {
+int32_t taosParseTime(const char* timestr, int64_t* utime, int32_t len, int32_t timePrec, int8_t day_light) {
   /* parse datatime string in with tz */
   if (strnchr(timestr, 'T', len, false) != NULL) {
-    return parseTimeWithTz(timestr, time, timePrec, 'T');
+    return parseTimeWithTz(timestr, utime, timePrec, 'T');
   } else if (checkTzPresent(timestr, len)) {
-    return parseTimeWithTz(timestr, time, timePrec, 0);
+    return parseTimeWithTz(timestr, utime, timePrec, 0);
   } else {
-    return (*parseLocaltimeFp[day_light])((char*)timestr, time, timePrec);
+    return (*parseLocaltimeFp[day_light])((char*)timestr, len, utime, timePrec);
   }
 }
 
@@ -333,12 +333,12 @@ static FORCE_INLINE bool validateTm(struct tm* pTm) {
   return  true;
 }
 
-int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
+int32_t parseLocaltime(char* timestr, int32_t len, int64_t* time, int32_t timePrec) {
   *time = 0;
   struct tm tm = {0};
 
   char* str = taosStrpTime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
-  if (str == NULL || !validateTm(&tm)) {
+  if (str == NULL || ((str - timestr) < len) || !validateTm(&tm)) {
     return -1;
   }
 
@@ -367,13 +367,13 @@ int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
   return 0;
 }
 
-int32_t parseLocaltimeDst(char* timestr, int64_t* time, int32_t timePrec) {
+int32_t parseLocaltimeDst(char* timestr, int32_t len, int64_t* time, int32_t timePrec) {
   *time = 0;
   struct tm tm = {0};
   tm.tm_isdst = -1;
 
   char* str = taosStrpTime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
-  if (str == NULL || !validateTm(&tm)) {
+  if (str == NULL || ((str - timestr) < len) || !validateTm(&tm)) {
     return -1;
   }
 
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index a92126b1a1..c7e2e3b9b5 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -4188,6 +4188,8 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) {
   SColumnInfoData* pInputCol = pInput->pData[0];
   SColumnInfoData* pOutput = (SColumnInfoData*)pCtx->pOutput;
 
+  int32_t alreadySampled = pInfo->numSampled;
+
   int32_t startOffset = pCtx->offset;
   for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; i += 1) {
     if (colDataIsNull_s(pInputCol, i)) {
@@ -4199,13 +4201,13 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) {
     doReservoirSample(pInfo, data, tsList[i], i);
   }
 
-  for (int32_t i = 0; i < pInfo->numSampled; ++i) {
+  for (int32_t i = alreadySampled; i < pInfo->numSampled; ++i) {
     int32_t pos = startOffset + i;
     colDataAppend(pOutput, pos, pInfo->data + i * pInfo->colBytes, false);
     //TODO: handle ts output
   }
 
-  return pInfo->numSampled;
+  return pInfo->numSampled - alreadySampled;
 }
 
 bool getTailFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
-- 
GitLab