database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3819 修复to_char函数存在的内存越界风险

Browse Source 
Merge pull request !3819 from Cross-罗/fix_DCH
This commit is contained in:
opengauss_bot
2023-07-26 11:27:05 +00:00
committed by Gitee
parent 09e949ceaf 39917e3171
commit 0ab3d300cb
1 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/common/backend/utils/adt/formatting.cpp
View File

@ -3698,19 +3698,55 @@ static void DCH_to_char(FormatNode* node, bool is_interval, TmToChar* in, char*
s += strlen(s);
break;
case DCH_RM:
if (!tm->tm_mon)
break;
rc = sprintf_s(s, len, "%*s", S_FM(n->suffix) ? 0 : -4, rm_months_upper[MONTHS_PER_YEAR - tm->tm_mon]);
securec_check_ss(rc, "\0", "\0");
s += strlen(s);
break;
case DCH_rm:
if (!tm->tm_mon)
/*
* For intervals, values like '12 month' will be reduced to 0
* month and some years. These should be processed.
*/
if (!tm->tm_mon && !tm->tm_year) {
break;
rc = sprintf_s(s, len, "%*s", S_FM(n->suffix) ? 0 : -4, rm_months_lower[MONTHS_PER_YEAR - tm->tm_mon]);
securec_check_ss(rc, "\0", "\0");
s += strlen(s);
break;
} else {
int mon = 0;
char** months = NULL;
if (n->key->id == DCH_RM) {
months = rm_months_upper;
} else {
months = rm_months_lower;
}
/*
* Compute the position in the roman-numeral array. Note
* that the contents of the array are reversed, December
* being first and January last.
*/
if (tm->tm_mon == 0) {
/*
* This case is special, and tracks the case of full
* interval years.
*/
mon = tm->tm_year >= 0 ? 0 : MONTHS_PER_YEAR - 1;
} else if (tm->tm_mon < 0) {
/*
* Negative case. In this case, the calculation is
* reversed, where -1 means December, -2 November,
* etc.
*/
mon = -1 * (tm->tm_mon + 1);
} else {
/*
* Common case, with a strictly positive value. The
* position in the array matches with the value of
* tm_mon.
*/
mon = MONTHS_PER_YEAR - tm->tm_mon;
}
rc = sprintf_s(s, len, "%*s", S_FM(n->suffix) ? 0 : -4, months[mon]);
securec_check_ss(rc, "\0", "\0");
s += strlen(s);
break;
}
case DCH_W:
rc = sprintf_s(s, len, "%d", (tm->tm_mday - 1) / 7 + 1);
securec_check_ss(rc, "\0", "\0");