database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-283 Fix mysql_calc_week

Browse Source 
The value of a NULL pointer could potentionally be accessed
This commit is contained in:
Andrew Hutchings
2016-09-05 21:49:38 +01:00
parent 7e0723a8bc
commit 21a081678d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/funcexp/funchelpers.h
View File

@ -311,7 +311,10 @@ inline uint32_t calc_mysql_week( uint32_t year, uint32_t month, uint32_t day,
bool first_weekday= modeflags & WEEK_GT_THREE_DAYS; bool first_weekday= modeflags & WEEK_GT_THREE_DAYS;
uint32_t weekday=calc_mysql_weekday(year, 1, 1, !monday_first); uint32_t weekday=calc_mysql_weekday(year, 1, 1, !monday_first);
*weekyear=year; if (weekyear)
{
*weekyear=year;
}
if (month == 1 && day <= 7-weekday) if (month == 1 && day <= 7-weekday)
{ {
@ -320,8 +323,12 @@ inline uint32_t calc_mysql_week( uint32_t year, uint32_t month, uint32_t day,
(!first_weekday && weekday >= 4))) (!first_weekday && weekday >= 4)))
return 0; return 0;
week_year= 1; week_year= 1;
(*weekyear)--; if (weekyear)
first_daynr-= (days=calc_mysql_days_in_year(*weekyear)); {
(*weekyear)--;
}
year--;
first_daynr-= (days=calc_mysql_days_in_year(year));
weekday= (weekday + 53*7- days) % 7; weekday= (weekday + 53*7- days) % 7;
} }
@ -333,11 +340,14 @@ inline uint32_t calc_mysql_week( uint32_t year, uint32_t month, uint32_t day,
if (week_year && days >= 52*7) if (week_year && days >= 52*7)
{ {
weekday= (weekday + calc_mysql_days_in_year(*weekyear)) % 7; weekday= (weekday + calc_mysql_days_in_year(year)) % 7;
if ((!first_weekday && weekday < 4) || if ((!first_weekday && weekday < 4) ||
(first_weekday && weekday == 0)) (first_weekday && weekday == 0))
{ {
(*weekyear)++; if (weekyear)
{
(*weekyear)++;
}
return 1; return 1;
} }
} }