mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Fix for spatial objects
This commit is contained in:
@ -2771,10 +2771,8 @@ String *Item_func_spatial_collection::val_str(String *str)
|
|||||||
uint32 n_points;
|
uint32 n_points;
|
||||||
double x1, y1, x2, y2;
|
double x1, y1, x2, y2;
|
||||||
|
|
||||||
if (len < WKB_HEADER_SIZE + 4 + 8 + 8)
|
if (len < 4 + 2 * POINT_DATA_SIZE)
|
||||||
goto ret;
|
goto ret;
|
||||||
data+=WKB_HEADER_SIZE;
|
|
||||||
len-=WKB_HEADER_SIZE;
|
|
||||||
|
|
||||||
uint32 llen=len;
|
uint32 llen=len;
|
||||||
const char *ldata=data;
|
const char *ldata=data;
|
||||||
@ -2786,10 +2784,6 @@ String *Item_func_spatial_collection::val_str(String *str)
|
|||||||
float8get(y1,data);
|
float8get(y1,data);
|
||||||
data+=8;
|
data+=8;
|
||||||
|
|
||||||
len-= 4 + 8 + 8;
|
|
||||||
|
|
||||||
if (len < n_points * POINT_DATA_SIZE)
|
|
||||||
goto ret;
|
|
||||||
data+=(n_points-2) * POINT_DATA_SIZE;
|
data+=(n_points-2) * POINT_DATA_SIZE;
|
||||||
|
|
||||||
float8get(x2,data);
|
float8get(x2,data);
|
||||||
|
Reference in New Issue
Block a user