database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

mysql-5.5.28

Browse Source
This commit is contained in:
Sergei Golubchik
2012-10-16 13:04:42 +02:00
parent d9a8799205 a619bfad30
commit ee9afef271
124 changed files with 3353 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/spatial.cc
View File

@ -601,7 +601,8 @@ uint Gis_line_string::init_from_wkb(const char *wkb, uint len,
Gis_point p;
if (len < 4 ||
(n_points= wkb_get_uint(wkb, bo))<1)
(n_points= wkb_get_uint(wkb, bo)) < 1 ||
n_points > max_n_points)
return 0;
proper_length= 4 + n_points * POINT_DATA_SIZE;
@ -1334,9 +1335,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))