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

Fix for BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS

Browse Source 
Problem:      
lack of incoming geometry data validation may 
lead to a server crash when ISCLOSED() function called.

Solution:
necessary incoming data check added.
This commit is contained in:
Ramil Kalimullin
2012-03-05 21:58:07 +04:00
parent 98642459db
commit 44d88da575
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/gis.result
View File

@ -1075,4 +1075,10 @@ SPATIAL INDEX i1 (col1, col2)
); );
ERROR HY000: Incorrect arguments to SPATIAL INDEX ERROR HY000: Incorrect arguments to SPATIAL INDEX
DROP TABLE t0, t1, t2; DROP TABLE t0, t1, t2;
#
# BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS
#
SELECT ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20)));
ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20)))
NULL
End of 5.1 tests End of 5.1 tests

7
mysql-test/t/gis.test
View File

@ -812,4 +812,11 @@ CREATE TABLE t3 (
# cleanup # cleanup
DROP TABLE t0, t1, t2; DROP TABLE t0, t1, t2;
--echo #
--echo # BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS
--echo #
SELECT ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20)));
--echo End of 5.1 tests --echo End of 5.1 tests

3
sql/spatial.cc
View File

@ -627,7 +627,8 @@ int Gis_line_string::is_closed(int *closed) const
return 0; return 0;
} }
data+= 4; data+= 4;
if (no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points)) if (n_points == 0 ||
no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
return 1; return 1;
/* Get first point */ /* Get first point */