Skip to content

bound datetime/time stmt param reads to the declared length #5164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmestwa-coder wants to merge 1 commit into
base: 10.6
Choose a base branch
from
+3 −3
Open

bound datetime/time stmt param reads to the declared length #5164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sql/sql_prepare.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ void Item_param::set_param_time(uchar **pos, ulong len)
tm.hour= (uint) to[5] + day * 24;
tm.minute= (uint) to[6];
tm.second= (uint) to[7];
tm.second_part= (length > 8) ? (ulong) sint4korr(to+8) : 0;
tm.second_part= (length >= 12) ? (ulong) sint4korr(to+8) : 0;
if (tm.hour > 838)
{
/* TODO: add warning 'Data truncated' here */
Expand Down Expand Up @@ -607,7 +607,7 @@ void Item_param::set_param_datetime(uchar **pos, ulong len)
tm.year= (uint) sint2korr(to);
tm.month= (uint) to[2];
tm.day= (uint) to[3];
if (length > 4)
if (length >= 7)
{
tm.hour= (uint) to[4];
tm.minute= (uint) to[5];
Expand All @@ -616,7 +616,7 @@ void Item_param::set_param_datetime(uchar **pos, ulong len)
else
tm.hour= tm.minute= tm.second= 0;

tm.second_part= (length > 7) ? (ulong) sint4korr(to+7) : 0;
tm.second_part= (length >= 11) ? (ulong) sint4korr(to+7) : 0;
}
else
set_zero_time(&tm, MYSQL_TIMESTAMP_DATETIME);
Expand Down