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
3fe96862
Commit
3fe96862
authored
Aug 17, 2012
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backporting Bug 14100466 from 5.6.
parent
a5ddcaab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
sql/spatial.cc
sql/spatial.cc
+6
-5
sql/spatial.h
sql/spatial.h
+8
-0
No files found.
sql/spatial.cc
View file @
3fe96862
...
...
@@ -525,12 +525,13 @@ uint Gis_line_string::init_from_wkb(const char *wkb, uint len,
const
char
*
wkb_end
;
Gis_point
p
;
if
(
len
<
4
)
if
(
len
<
4
||
(
n_points
=
wkb_get_uint
(
wkb
,
bo
))
<
1
||
n_points
>
max_n_points
)
return
0
;
n_points
=
wkb_get_uint
(
wkb
,
bo
);
proper_length
=
4
+
n_points
*
POINT_DATA_SIZE
;
if
(
!
n_points
||
len
<
proper_length
||
res
->
reserve
(
proper_length
))
if
(
len
<
proper_length
||
res
->
reserve
(
proper_length
))
return
0
;
res
->
q_append
(
n_points
);
...
...
@@ -1072,9 +1073,9 @@ uint Gis_multi_point::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
Gis_point
p
;
const
char
*
wkb_end
;
if
(
len
<
4
)
if
(
len
<
4
||
(
n_points
=
wkb_get_uint
(
wkb
,
bo
))
>
max_n_points
)
return
0
;
n_points
=
wkb_get_uint
(
wkb
,
bo
);
proper_size
=
4
+
n_points
*
(
WKB_HEADER_SIZE
+
POINT_DATA_SIZE
);
if
(
len
<
proper_size
||
res
->
reserve
(
proper_size
))
...
...
sql/spatial.h
View file @
3fe96862
...
...
@@ -379,6 +379,10 @@ public:
class
Gis_line_string
:
public
Geometry
{
// Maximum number of points in LineString that can fit into String
static
const
uint32
max_n_points
=
(
uint32
)
(
UINT_MAX32
-
WKB_HEADER_SIZE
-
4
/* n_points */
)
/
POINT_DATA_SIZE
;
public:
Gis_line_string
()
{}
/* Remove gcc warning */
virtual
~
Gis_line_string
()
{}
/* Remove gcc warning */
...
...
@@ -435,6 +439,10 @@ public:
class
Gis_multi_point
:
public
Geometry
{
// Maximum number of points in MultiPoint that can fit into String
static
const
uint32
max_n_points
=
(
uint32
)
(
UINT_MAX32
-
WKB_HEADER_SIZE
-
4
/* n_points */
)
/
(
WKB_HEADER_SIZE
+
POINT_DATA_SIZE
);
public:
Gis_multi_point
()
{}
/* Remove gcc warning */
virtual
~
Gis_multi_point
()
{}
/* Remove gcc warning */
...
...
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