[Pkg-mysql-commits] r1747 - in mysql-dfsg-5.0/branches/lenny-security/debian: . patches
Sean Finney
seanius at alioth.debian.org
Sun Sep 13 22:42:36 UTC 2009
Author: seanius
Date: 2009-09-13 22:42:36 +0000 (Sun, 13 Sep 2009)
New Revision: 1747
Modified:
mysql-dfsg-5.0/branches/lenny-security/debian/changelog
mysql-dfsg-5.0/branches/lenny-security/debian/patches/65_fix_gis_functions_crash.dpatch
Log:
take version of 65_fix_gis_functions_crash.dpatch from s-p-u
f*cking subversion, even after trying to merge the files things
were messed up. this is the version of the file in the s-p-u branch,
copied and committed directly.
Modified: mysql-dfsg-5.0/branches/lenny-security/debian/changelog
===================================================================
--- mysql-dfsg-5.0/branches/lenny-security/debian/changelog 2009-09-13 22:37:06 UTC (rev 1746)
+++ mysql-dfsg-5.0/branches/lenny-security/debian/changelog 2009-09-13 22:42:36 UTC (rev 1747)
@@ -1,15 +1,15 @@
-mysql-dfsg-5.0 (5.0.51a-24lenny1) stable-proposed-updates; urgency=low
+mysql-dfsg-5.0 (5.0.51a-24+lenny2+spu1) stable-proposed-updates; urgency=low
[ Sean Finney ]
* New patch 64_fix-dummy-thread-race-condition.dpatch to back out an
- unneeded workaround that causes segfaults in libmysqlclient15. Thanks
+ unneeded workaround that causes segfaults in libmysqlclient15. Thanks
to Martin Koegler for digging up the patch. (closes: #524366, #513204).
[ Norbert Tretkowski ]
* New patch 65_fix_gis_functions_crash.dpatch from 5.0.82 to fix a server
crash with arbitrary data input plus GIS functions. (closes: #477072)
- -- Norbert Tretkowski <nobse at debian.org> Tue, 12 May 2009 10:01:40 +0200
+ -- Sean Finney <seanius at debian.org> Sat, 05 Sep 2009 12:15:22 +0200
mysql-dfsg-5.0 (5.0.51a-24+lenny2) stable-security; urgency=high
Modified: mysql-dfsg-5.0/branches/lenny-security/debian/patches/65_fix_gis_functions_crash.dpatch
===================================================================
--- mysql-dfsg-5.0/branches/lenny-security/debian/patches/65_fix_gis_functions_crash.dpatch 2009-09-13 22:37:06 UTC (rev 1746)
+++ mysql-dfsg-5.0/branches/lenny-security/debian/patches/65_fix_gis_functions_crash.dpatch 2009-09-13 22:42:36 UTC (rev 1747)
@@ -1,10 +1,59 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 65_fix_gis_functions_crash.dpatch by Norbert Tretkowski <nobse at debian.org>
+## 65_fix_gis_functions_crash.dpatch by Sean Finney <seanius at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
+## DP: backported GIS fixes from upstream's 5.0 tree
## DP: http://bugs.mysql.com/bug.php?id=38990
+## DP: Note: hunk #4 was removed from the tests/results as it patches a
+## DP: testcase that did not seem to exist.
+From: Date: April 28 2009 11:48am
+Subject: bzr commit into mysql-5.0-bugteam branch (holyfoot:2735) Bug#38990
+List-Archive: http://lists.mysql.com/commits/72897
+X-Bug: 38990
+Message-Id: <20090428094813.68D162C380C1 at hfmain.localdomain>
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="Boundary_(ID_CxPl8cT7nUoENgIkwsMMOg)"
- at DPATCH@
+--Boundary_(ID_CxPl8cT7nUoENgIkwsMMOg)
+MIME-version: 1.0
+Content-type: text/plain; charset=us-ascii
+Content-transfer-encoding: 7BIT
+Content-disposition: inline
+
+#At file:///home/hf/work/mysql_common/50mrg/ based on revid:gshchepa at stripped
+
+ 2735 Alexey Botchkov 2009-04-28
+ Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash
+ the Point() and Linestring() functions create WKB representation of an
+ object instead of an real geometry object.
+ That produced bugs when these were inserted into tables.
+
+ GIS tests fixed accordingly.
+
+ per-file messages:
+ mysql-test/r/gis-rtree.result
+ Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash
+ test result
+ mysql-test/r/gis.result
+ Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash
+ test result
+ mysql-test/t/gis-rtree.test
+ Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash
+ test fixed - GeomFromWKB invocations removed
+ mysql-test/t/gis.test
+ Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash
+ test fixed - AsWKB invocations added
+ sql/item_geofunc.cc
+ Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash
+ Point() and similar functions to create a proper object
+
+ modified:
+ mysql-test/r/gis-rtree.result
+ mysql-test/r/gis.result
+ mysql-test/t/gis-rtree.test
+ mysql-test/t/gis.test
+ sql/item_geofunc.cc
+=== modified file 'mysql-test/r/gis-rtree.result'
--- a/mysql-test/r/gis-rtree.result 2007-10-10 13:26:02 +0000
+++ b/mysql-test/r/gis-rtree.result 2009-04-28 09:47:26 +0000
@@ -186,106 +186,106 @@ CREATE TABLE t2 (
@@ -838,72 +887,7 @@
1
1
1
-@@ -1426,35 +1426,35 @@ Table Op Msg_type Msg_text
- test.t1 check status OK
- DROP TABLE t1;
- create table t1 (a geometry not null, spatial index(a));
--insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 131072)));
--insert into t1 values (PointFromWKB(POINT(9.1248812352444e+192, 2.9740338169556e+284)));
--insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, -0)));
--insert into t1 values (PointFromWKB(POINT(1.49166814624e-154, 2.0880974297595e-53)));
--insert into t1 values (PointFromWKB(POINT(4.0917382598702e+149, 1.2024538023802e+111)));
--insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 2.9993936277913e-241)));
--insert into t1 values (PointFromWKB(POINT(2.5243548967072e-29, 1.2024538023802e+111)));
--insert into t1 values (PointFromWKB(POINT(0, 6.9835074892995e-251)));
--insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 3.1050361846014e+231)));
--insert into t1 values (PointFromWKB(POINT(2.8728483499323e-188, 2.4600631144627e+260)));
--insert into t1 values (PointFromWKB(POINT(3.0517578125e-05, 2.0349165139404e+236)));
--insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 1.1818212630766e-125)));
--insert into t1 values (PointFromWKB(POINT(2.481040258324e-265, 5.7766220027675e-275)));
--insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 2.5243548967072e-29)));
--insert into t1 values (PointFromWKB(POINT(5.7766220027675e-275, 9.9464647281957e+86)));
--insert into t1 values (PointFromWKB(POINT(2.2181357552967e+130, 3.7857669957337e-270)));
--insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.6893488147419e+19)));
--insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.7537584144024e+255)));
--insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 1.8033161362863e-130)));
--insert into t1 values (PointFromWKB(POINT(0, 5.8774717541114e-39)));
--insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 2.2761049594727e-159)));
--insert into t1 values (PointFromWKB(POINT(6.243497100632e+144, 3.7857669957337e-270)));
--insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 2.6355494858076e-82)));
--insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 3.8518598887745e-34)));
--insert into t1 values (PointFromWKB(POINT(4.6566128730774e-10, 2.0880974297595e-53)));
--insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 1.8827498946116e-183)));
--insert into t1 values (PointFromWKB(POINT(1.8033161362863e-130, 9.1248812352444e+192)));
--insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, 2.2761049594727e-159)));
--insert into t1 values (PointFromWKB(POINT(1.94906280228e+289, 1.2338789709327e-178)));
-+insert into t1 values (POINT(1.1517219314031e+164, 131072));
-+insert into t1 values (POINT(9.1248812352444e+192, 2.9740338169556e+284));
-+insert into t1 values (POINT(4.7783097267365e-299, -0));
-+insert into t1 values (POINT(1.49166814624e-154, 2.0880974297595e-53));
-+insert into t1 values (POINT(4.0917382598702e+149, 1.2024538023802e+111));
-+insert into t1 values (POINT(2.0349165139404e+236, 2.9993936277913e-241));
-+insert into t1 values (POINT(2.5243548967072e-29, 1.2024538023802e+111));
-+insert into t1 values (POINT(0, 6.9835074892995e-251));
-+insert into t1 values (POINT(2.0880974297595e-53, 3.1050361846014e+231));
-+insert into t1 values (POINT(2.8728483499323e-188, 2.4600631144627e+260));
-+insert into t1 values (POINT(3.0517578125e-05, 2.0349165139404e+236));
-+insert into t1 values (POINT(1.1517219314031e+164, 1.1818212630766e-125));
-+insert into t1 values (POINT(2.481040258324e-265, 5.7766220027675e-275));
-+insert into t1 values (POINT(2.0880974297595e-53, 2.5243548967072e-29));
-+insert into t1 values (POINT(5.7766220027675e-275, 9.9464647281957e+86));
-+insert into t1 values (POINT(2.2181357552967e+130, 3.7857669957337e-270));
-+insert into t1 values (POINT(4.5767114681874e-246, 3.6893488147419e+19));
-+insert into t1 values (POINT(4.5767114681874e-246, 3.7537584144024e+255));
-+insert into t1 values (POINT(3.7857669957337e-270, 1.8033161362863e-130));
-+insert into t1 values (POINT(0, 5.8774717541114e-39));
-+insert into t1 values (POINT(1.1517219314031e+164, 2.2761049594727e-159));
-+insert into t1 values (POINT(6.243497100632e+144, 3.7857669957337e-270));
-+insert into t1 values (POINT(3.7857669957337e-270, 2.6355494858076e-82));
-+insert into t1 values (POINT(2.0349165139404e+236, 3.8518598887745e-34));
-+insert into t1 values (POINT(4.6566128730774e-10, 2.0880974297595e-53));
-+insert into t1 values (POINT(2.0880974297595e-53, 1.8827498946116e-183));
-+insert into t1 values (POINT(1.8033161362863e-130, 9.1248812352444e+192));
-+insert into t1 values (POINT(4.7783097267365e-299, 2.2761049594727e-159));
-+insert into t1 values (POINT(1.94906280228e+289, 1.2338789709327e-178));
- drop table t1;
- CREATE TABLE t1(foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );
- INSERT INTO t1(foo) VALUES (NULL);
-
+=== modified file 'mysql-test/r/gis.result'
--- a/mysql-test/r/gis.result 2009-01-28 17:59:08 +0000
+++ b/mysql-test/r/gis.result 2009-04-28 09:47:26 +0000
@@ -47,26 +47,26 @@ INSERT INTO gis_point VALUES
@@ -940,6 +924,7 @@
INSERT into gis_geometry SELECT * FROM gis_line;
INSERT into gis_geometry SELECT * FROM gis_polygon;
+=== modified file 'mysql-test/t/gis-rtree.test'
--- a/mysql-test/t/gis-rtree.test 2007-10-05 10:41:56 +0000
+++ b/mysql-test/t/gis-rtree.test 2009-04-28 09:47:26 +0000
@@ -41,7 +41,7 @@ while ($1)
@@ -977,72 +962,6 @@
DROP TABLE t1;
#
-@@ -802,35 +802,35 @@ DROP TABLE t1;
- #
-
- create table t1 (a geometry not null, spatial index(a));
--insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 131072)));
--insert into t1 values (PointFromWKB(POINT(9.1248812352444e+192, 2.9740338169556e+284)));
--insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, -0)));
--insert into t1 values (PointFromWKB(POINT(1.49166814624e-154, 2.0880974297595e-53)));
--insert into t1 values (PointFromWKB(POINT(4.0917382598702e+149, 1.2024538023802e+111)));
--insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 2.9993936277913e-241)));
--insert into t1 values (PointFromWKB(POINT(2.5243548967072e-29, 1.2024538023802e+111)));
--insert into t1 values (PointFromWKB(POINT(0, 6.9835074892995e-251)));
--insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 3.1050361846014e+231)));
--insert into t1 values (PointFromWKB(POINT(2.8728483499323e-188, 2.4600631144627e+260)));
--insert into t1 values (PointFromWKB(POINT(3.0517578125e-05, 2.0349165139404e+236)));
--insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 1.1818212630766e-125)));
--insert into t1 values (PointFromWKB(POINT(2.481040258324e-265, 5.7766220027675e-275)));
--insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 2.5243548967072e-29)));
--insert into t1 values (PointFromWKB(POINT(5.7766220027675e-275, 9.9464647281957e+86)));
--insert into t1 values (PointFromWKB(POINT(2.2181357552967e+130, 3.7857669957337e-270)));
--insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.6893488147419e+19)));
--insert into t1 values (PointFromWKB(POINT(4.5767114681874e-246, 3.7537584144024e+255)));
--insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 1.8033161362863e-130)));
--insert into t1 values (PointFromWKB(POINT(0, 5.8774717541114e-39)));
--insert into t1 values (PointFromWKB(POINT(1.1517219314031e+164, 2.2761049594727e-159)));
--insert into t1 values (PointFromWKB(POINT(6.243497100632e+144, 3.7857669957337e-270)));
--insert into t1 values (PointFromWKB(POINT(3.7857669957337e-270, 2.6355494858076e-82)));
--insert into t1 values (PointFromWKB(POINT(2.0349165139404e+236, 3.8518598887745e-34)));
--insert into t1 values (PointFromWKB(POINT(4.6566128730774e-10, 2.0880974297595e-53)));
--insert into t1 values (PointFromWKB(POINT(2.0880974297595e-53, 1.8827498946116e-183)));
--insert into t1 values (PointFromWKB(POINT(1.8033161362863e-130, 9.1248812352444e+192)));
--insert into t1 values (PointFromWKB(POINT(4.7783097267365e-299, 2.2761049594727e-159)));
--insert into t1 values (PointFromWKB(POINT(1.94906280228e+289, 1.2338789709327e-178)));
-+insert into t1 values (POINT(1.1517219314031e+164, 131072));
-+insert into t1 values (POINT(9.1248812352444e+192, 2.9740338169556e+284));
-+insert into t1 values (POINT(4.7783097267365e-299, -0));
-+insert into t1 values (POINT(1.49166814624e-154, 2.0880974297595e-53));
-+insert into t1 values (POINT(4.0917382598702e+149, 1.2024538023802e+111));
-+insert into t1 values (POINT(2.0349165139404e+236, 2.9993936277913e-241));
-+insert into t1 values (POINT(2.5243548967072e-29, 1.2024538023802e+111));
-+insert into t1 values (POINT(0, 6.9835074892995e-251));
-+insert into t1 values (POINT(2.0880974297595e-53, 3.1050361846014e+231));
-+insert into t1 values (POINT(2.8728483499323e-188, 2.4600631144627e+260));
-+insert into t1 values (POINT(3.0517578125e-05, 2.0349165139404e+236));
-+insert into t1 values (POINT(1.1517219314031e+164, 1.1818212630766e-125));
-+insert into t1 values (POINT(2.481040258324e-265, 5.7766220027675e-275));
-+insert into t1 values (POINT(2.0880974297595e-53, 2.5243548967072e-29));
-+insert into t1 values (POINT(5.7766220027675e-275, 9.9464647281957e+86));
-+insert into t1 values (POINT(2.2181357552967e+130, 3.7857669957337e-270));
-+insert into t1 values (POINT(4.5767114681874e-246, 3.6893488147419e+19));
-+insert into t1 values (POINT(4.5767114681874e-246, 3.7537584144024e+255));
-+insert into t1 values (POINT(3.7857669957337e-270, 1.8033161362863e-130));
-+insert into t1 values (POINT(0, 5.8774717541114e-39));
-+insert into t1 values (POINT(1.1517219314031e+164, 2.2761049594727e-159));
-+insert into t1 values (POINT(6.243497100632e+144, 3.7857669957337e-270));
-+insert into t1 values (POINT(3.7857669957337e-270, 2.6355494858076e-82));
-+insert into t1 values (POINT(2.0349165139404e+236, 3.8518598887745e-34));
-+insert into t1 values (POINT(4.6566128730774e-10, 2.0880974297595e-53));
-+insert into t1 values (POINT(2.0880974297595e-53, 1.8827498946116e-183));
-+insert into t1 values (POINT(1.8033161362863e-130, 9.1248812352444e+192));
-+insert into t1 values (POINT(4.7783097267365e-299, 2.2761049594727e-159));
-+insert into t1 values (POINT(1.94906280228e+289, 1.2338789709327e-178));
- drop table t1;
-
- # End of 4.1 tests
-
--- a/mysql-test/t/gis.test 2009-02-15 09:26:08 +0000
+++ b/mysql-test/t/gis.test 2009-04-28 09:47:26 +0000
@@ -36,32 +36,32 @@ INSERT INTO gis_point VALUES
@@ -1085,6 +1004,7 @@
INSERT into gis_geometry SELECT * FROM gis_point;
INSERT into gis_geometry SELECT * FROM gis_line;
+=== modified file 'sql/item_geofunc.cc'
--- a/sql/item_geofunc.cc 2007-11-17 12:48:57 +0000
+++ b/sql/item_geofunc.cc 2009-04-28 09:47:26 +0000
@@ -70,10 +70,17 @@ String *Item_func_geometry_from_wkb::val
More information about the Pkg-mysql-commits
mailing list