From cbfa116d069c10a42360bcd6504e4080d2d236be Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Thu, 9 Jun 2022 17:17:10 +0800
Subject: [PATCH] fix(query): add to_iso8601 function timezone validation

TD-16372
---
 source/libs/function/src/builtins.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index b628128670..04b171b9af 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -1028,8 +1028,8 @@ static bool validateHourRange(int8_t hour) {
   return true;
 }
 
-static bool validateMinuteRange(int8_t hour, int8_t minute) {
-  if (minute == 0 || (minute == 30 && (hour == 3 || hour == 5))) {
+static bool validateMinuteRange(int8_t hour, int8_t minute, char sign) {
+  if (minute == 0 || (minute == 30 && (hour == 3 || hour == 5) && sign == '-')) {
     return true;
   }
 
@@ -1068,7 +1068,7 @@ static bool validateTimezoneFormat(const SValueNode* pVal) {
           } else if (i == 4) {
             memcpy(buf, &tz[i - 1], 2);
             minute = taosStr2Int8(buf, NULL, 10);
-            if (!validateMinuteRange(hour, minute)) {
+            if (!validateMinuteRange(hour, minute, tz[0])) {
               return false;
             }
           }
@@ -1097,7 +1097,7 @@ static bool validateTimezoneFormat(const SValueNode* pVal) {
           } else if (i == 5) {
             memcpy(buf, &tz[i - 1], 2);
             minute = taosStr2Int8(buf, NULL, 10);
-            if (!validateMinuteRange(hour, minute)) {
+            if (!validateMinuteRange(hour, minute, tz[0])) {
               return false;
             }
           }