database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge MariaDB 5.1.66 -> 5.2 -> 5.3

Browse Source
This commit is contained in:
unknown
2012-11-09 10:11:20 +02:00
parent 94cae65774 8df490044c
commit 3f59033536
139 changed files with 7882 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/spatial.cc
View File

@ -597,7 +597,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;
@ -1331,9 +1332,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))