Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
5d9e50fc
Commit
5d9e50fc
authored
Apr 06, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-4244 [PATCH] Buffer overruns and use-after-free errors
fixes for gcc 4.8 -fsanitize=address
parent
6770a9a8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
sql/multi_range_read.cc
sql/multi_range_read.cc
+1
-1
sql/sql_show.cc
sql/sql_show.cc
+3
-3
No files found.
sql/multi_range_read.cc
View file @
5d9e50fc
...
@@ -1632,7 +1632,7 @@ int DsMrr_impl::dsmrr_explain_info(uint mrr_mode, char *str, size_t size)
...
@@ -1632,7 +1632,7 @@ int DsMrr_impl::dsmrr_explain_info(uint mrr_mode, char *str, size_t size)
uint
used_str_len
=
strlen
(
used_str
);
uint
used_str_len
=
strlen
(
used_str
);
uint
copy_len
=
min
(
used_str_len
,
size
);
uint
copy_len
=
min
(
used_str_len
,
size
);
memcpy
(
str
,
used_str
,
size
);
memcpy
(
str
,
used_str
,
copy_len
);
return
copy_len
;
return
copy_len
;
}
}
return
0
;
return
0
;
...
...
sql/sql_show.cc
View file @
5d9e50fc
...
@@ -6617,20 +6617,20 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list)
...
@@ -6617,20 +6617,20 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list)
break
;
break
;
case
MYSQL_TYPE_DATE
:
case
MYSQL_TYPE_DATE
:
if
(
!
(
item
=
new
Item_return_date_time
(
fields_info
->
field_name
,
if
(
!
(
item
=
new
Item_return_date_time
(
fields_info
->
field_name
,
MAX_DATE_WIDTH
,
strlen
(
fields_info
->
field_name
)
,
fields_info
->
field_type
)))
fields_info
->
field_type
)))
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
break
;
break
;
case
MYSQL_TYPE_TIME
:
case
MYSQL_TYPE_TIME
:
if
(
!
(
item
=
new
Item_return_date_time
(
fields_info
->
field_name
,
if
(
!
(
item
=
new
Item_return_date_time
(
fields_info
->
field_name
,
MAX_TIME_FULL_WIDTH
,
strlen
(
fields_info
->
field_name
)
,
fields_info
->
field_type
)))
fields_info
->
field_type
)))
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
break
;
break
;
case
MYSQL_TYPE_TIMESTAMP
:
case
MYSQL_TYPE_TIMESTAMP
:
case
MYSQL_TYPE_DATETIME
:
case
MYSQL_TYPE_DATETIME
:
if
(
!
(
item
=
new
Item_return_date_time
(
fields_info
->
field_name
,
if
(
!
(
item
=
new
Item_return_date_time
(
fields_info
->
field_name
,
MAX_DATETIME_WIDTH
,
strlen
(
fields_info
->
field_name
)
,
fields_info
->
field_type
)))
fields_info
->
field_type
)))
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
break
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment