|
 |
906d64a |
It seems CVE-2013-1861 has been fixed in MySQL upstream, but they don't
|
|
|
906d64a |
ship a test case for that. This patch only includes the test case ported
|
|
|
906d64a |
from MariaDB fix:
|
|
|
906d64a |
https://mariadb.atlassian.net/browse/MDEV-4252
|
|
|
906d64a |
|
|
|
80c5bbd |
diff -up mysql-5.5.31/mysql-test/r/gis.result.cve mysql-5.5.31/mysql-test/r/gis.result
|
|
|
80c5bbd |
--- mysql-5.5.31/mysql-test/r/gis.result.cve 2013-06-03 16:32:33.732025515 +0200
|
|
|
80c5bbd |
+++ mysql-5.5.31/mysql-test/r/gis.result 2013-06-03 16:34:04.519691044 +0200
|
|
|
80c5bbd |
@@ -1113,4 +1113,19 @@ SELECT 1 FROM g1 WHERE a >= ANY
|
|
|
80c5bbd |
(SELECT 1 FROM g1 WHERE a = geomfromtext('') OR a) ;
|
|
|
80c5bbd |
1
|
|
|
80c5bbd |
DROP TABLE g1;
|
|
|
80c5bbd |
+#
|
|
|
80c5bbd |
+# TODO-424 geometry query crashes server
|
|
|
80c5bbd |
+#
|
|
|
80c5bbd |
+select astext(0x0100000000030000000100000000000010);
|
|
|
80c5bbd |
+astext(0x0100000000030000000100000000000010)
|
|
|
80c5bbd |
+NULL
|
|
|
80c5bbd |
+select area(0x0100000000030000000100000000000010);
|
|
|
80c5bbd |
+area(0x0100000000030000000100000000000010)
|
|
|
80c5bbd |
+NULL
|
|
|
80c5bbd |
+select astext(exteriorring(0x0100000000030000000100000000000010));
|
|
|
80c5bbd |
+astext(exteriorring(0x0100000000030000000100000000000010))
|
|
|
80c5bbd |
+NULL
|
|
|
80c5bbd |
+select astext(centroid(0x0100000000030000000100000000000010));
|
|
|
80c5bbd |
+astext(centroid(0x0100000000030000000100000000000010))
|
|
|
80c5bbd |
+NULL
|
|
|
80c5bbd |
End of 5.5 tests
|
|
|
80c5bbd |
diff -up mysql-5.5.31/mysql-test/t/gis.test.cve mysql-5.5.31/mysql-test/t/gis.test
|
|
|
80c5bbd |
--- mysql-5.5.31/mysql-test/t/gis.test.cve 2013-06-03 16:32:33.733025512 +0200
|
|
|
80c5bbd |
+++ mysql-5.5.31/mysql-test/t/gis.test 2013-06-03 16:34:38.942560749 +0200
|
|
|
80c5bbd |
@@ -868,4 +868,11 @@ SELECT 1 FROM g1 WHERE a >= ANY
|
|
|
80c5bbd |
|
|
|
80c5bbd |
DROP TABLE g1;
|
|
|
80c5bbd |
|
|
|
80c5bbd |
+--echo #
|
|
|
80c5bbd |
+--echo # TODO-424 geometry query crashes server
|
|
|
80c5bbd |
+--echo #
|
|
|
80c5bbd |
+select astext(0x0100000000030000000100000000000010);
|
|
|
80c5bbd |
+select area(0x0100000000030000000100000000000010);
|
|
|
80c5bbd |
+select astext(exteriorring(0x0100000000030000000100000000000010));
|
|
|
80c5bbd |
+select astext(centroid(0x0100000000030000000100000000000010));
|
|
|
80c5bbd |
--echo End of 5.5 tests
|