mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
634d3ff2c6
- bug #11655 "Wrong time is returning from nested selects - maximum time exists - input and output TIME values were not validated properly in several conversion functions - bug #20927 "sec_to_time treats big unsigned as signed" - integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0 - BIGINT UNSIGNED values were treated as SIGNED in several functions - in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced include/my_time.h: Added defines for the TIME limits Added defines for the warning flags set by str_to_time() and check_time_range() Added check_time_range() declaration mysql-test/r/func_sapdb.result: Fixed testcases which relied on incorrect TIMEDIFF() behaviour mysql-test/r/func_time.result: Fixed testcase which relied on incorrect behaviour Added testcases for out-of-range values in SEC_TO_TIME(), TIME_TO_SEC(), ADDTIME(), SUBTIME() and EXTRACT() mysql-test/t/func_time.test: Added testcases for out-of-range values in SEC_TO_TIME(), TIME_TO_SEC(), ADDTIME(), SUBTIME() and EXTRACT() sql-common/my_time.c: Added check_time_range() to be used from str_to_time() and item_timefunc.cc Added new out-of-range flag to str_to_time() warnings Use '%u' instead of '%d' in my_*_to_str() because the arguments are unsigned sql/field.cc: Replaced out-of-range checks with checks for flags returned by str_to_time() sql/item_timefunc.cc: Added wrappers over make_datetime() and make_time() which perform out-of-range checks on input values Moved common code in Item_func_sec_to_time::val_str() and Item_func_sec_to_time::val_int() into a separate function sec_to_time() Replaced calls to make_datetime() with make_datetime_with_warn() in Item_func_add_time and Item_func_timediff Checks for 'unsigned int' overflows in Item_func_maketime Use make_time_with_warn() instead of make_time() in Item_func_maketime Fixed incorrect sizeof() in Item_func_str_to_date::get_time() sql/time.cc: Check for return value of str_to_time() along with warning flags
92 lines
2.8 KiB
C
92 lines
2.8 KiB
C
/* Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
This is a private header of sql-common library, containing
|
|
declarations for my_time.c
|
|
*/
|
|
|
|
#ifndef _my_time_h_
|
|
#define _my_time_h_
|
|
#include "my_global.h"
|
|
#include "mysql_time.h"
|
|
|
|
C_MODE_START
|
|
|
|
extern ulonglong log_10_int[20];
|
|
extern uchar days_in_month[];
|
|
|
|
/*
|
|
Portable time_t replacement.
|
|
Should be signed and hold seconds for 1902-2038 range.
|
|
*/
|
|
typedef long my_time_t;
|
|
|
|
#define MY_TIME_T_MAX LONG_MAX
|
|
#define MY_TIME_T_MIN LONG_MIN
|
|
|
|
#define YY_PART_YEAR 70
|
|
|
|
/* Flags to str_to_datetime */
|
|
#define TIME_FUZZY_DATE 1
|
|
#define TIME_DATETIME_ONLY 2
|
|
|
|
#define MYSQL_TIME_WARN_TRUNCATED 1
|
|
#define MYSQL_TIME_WARN_OUT_OF_RANGE 2
|
|
|
|
/* Limits for the TIME data type */
|
|
#define TIME_MAX_HOUR 838
|
|
#define TIME_MAX_MINUTE 59
|
|
#define TIME_MAX_SECOND 59
|
|
#define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \
|
|
TIME_MAX_SECOND)
|
|
|
|
enum enum_mysql_timestamp_type
|
|
str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
|
|
uint flags, int *was_cut);
|
|
|
|
bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
|
|
int *warning);
|
|
|
|
int check_time_range(struct st_mysql_time *time, int *warning);
|
|
|
|
long calc_daynr(uint year,uint month,uint day);
|
|
|
|
void init_time(void);
|
|
|
|
my_time_t
|
|
my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap);
|
|
|
|
void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type);
|
|
|
|
/*
|
|
Required buffer length for my_time_to_str, my_date_to_str,
|
|
my_datetime_to_str and TIME_to_string functions. Note, that the
|
|
caller is still responsible to check that given TIME structure
|
|
has values in valid ranges, otherwise size of the buffer could
|
|
be not enough. We also rely on the fact that even wrong values
|
|
sent using binary protocol fit in this buffer.
|
|
*/
|
|
#define MAX_DATE_STRING_REP_LENGTH 30
|
|
|
|
int my_time_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_date_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_datetime_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_TIME_to_str(const MYSQL_TIME *l_time, char *to);
|
|
|
|
C_MODE_END
|
|
|
|
#endif /* _my_time_h_ */
|