Skip to content

T
TDengine

taosdata / TDengine
大约 1 年 前同步成功

通知 1181
Star 22014
Fork 4786
T
TDengine

体验新版 GitCode，发现更多精彩内容 >>

提交 cbfa116d 编写于 作者: G Ganlin Zhao
浏览文件
操作

fix(query): add to_iso8601 function timezone validation 

TD-16372
上级 32591162
显示空白变更内容
内联 并排
Showing with 4 addition and 4 deletion
source/libs/function/src/builtins.c
浏览文件 @ cbfa116d
...@@ -1028,8 +1028,8 @@ static bool validateHourRange(int8_t hour) { ...@@ -1028,8 +1028,8 @@ static bool validateHourRange(int8_t hour) {
return true; return true;
} }
static bool validateMinuteRange(int8_t hour, int8_t minute) { static bool validateMinuteRange(int8_t hour, int8_t minute, char sign) {
if (minute == 0 || (minute == 30 && (hour == 3 || hour == 5))) { if (minute == 0 || (minute == 30 && (hour == 3 || hour == 5) && sign == '-')) {
return true; return true;
} }
...@@ -1068,7 +1068,7 @@ static bool validateTimezoneFormat(const SValueNode* pVal) { ...@@ -1068,7 +1068,7 @@ static bool validateTimezoneFormat(const SValueNode* pVal) {
} else if (i == 4) { } else if (i == 4) {
memcpy(buf, &tz[i - 1], 2); memcpy(buf, &tz[i - 1], 2);
minute = taosStr2Int8(buf, NULL, 10); minute = taosStr2Int8(buf, NULL, 10);
if (!validateMinuteRange(hour, minute)) { if (!validateMinuteRange(hour, minute, tz[0])) {
return false; return false;
} }
} }
...@@ -1097,7 +1097,7 @@ static bool validateTimezoneFormat(const SValueNode* pVal) { ...@@ -1097,7 +1097,7 @@ static bool validateTimezoneFormat(const SValueNode* pVal) {
} else if (i == 5) { } else if (i == 5) {
memcpy(buf, &tz[i - 1], 2); memcpy(buf, &tz[i - 1], 2);
minute = taosStr2Int8(buf, NULL, 10); minute = taosStr2Int8(buf, NULL, 10);
if (!validateMinuteRange(hour, minute)) { if (!validateMinuteRange(hour, minute, tz[0])) {
return false; return false;
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或