Skip to content

MDEV-40143: st_isvalid() does not clear NULL state between rows #5313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaveGosselin-MariaDB wants to merge 1 commit into
base: 12.3
Choose a base branch
from
+35 −4
Open

MDEV-40143: st_isvalid() does not clear NULL state between rows #5313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions mysql-test/main/spatial_utility_function_isvalid.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,22 @@ c
SELECT st_astext(ST_VALIDATE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( ( 2 2, 2 8, 8 8, 8 2, 2 2 ), ( 4 4, 4 6, 6 6, 6 4, 4 4 ) ), ( (0 2,1 2,1 3,0 3,0 2) ) ) '), ST_GEOMFROMTEXT(' POLYGON( ( 6 6, 5 8, 0 8, 8 1, 7 6, 6 6 ) ) ') ) ) ) <> '' c;
c
1
#
# Start of 12.3 tests
#
CREATE TABLE t0 (c0 INT,c1 POINT);
INSERT INTO t0 VALUES (-4, Point(0,0));
INSERT INTO t0 VALUES (6, NULL);
INSERT INTO t0 VALUES (9, Point(1,1));
SELECT ST_ISVALID(t0.c1) FROM t0;
ST_ISVALID(t0.c1)
1
NULL
1
SELECT ST_ASTEXT(t0.c1) FROM t0;
ST_ASTEXT(t0.c1)
POINT(0 0)
NULL
POINT(1 1)
DROP TABLE t0;
# End of 12.3 tests
14 changes: 14 additions & 0 deletions mysql-test/main/spatial_utility_function_isvalid.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,3 +396,17 @@ SELECT ST_IsValid(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( (2 2, 2 4, 4 4, 4 2, 2 2) )
--echo # MDEV-36042 Assertion failed in Binary_string::q_append
--echo #
SELECT st_astext(ST_VALIDATE(ST_SYMDIFFERENCE(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( ( 2 2, 2 8, 8 8, 8 2, 2 2 ), ( 4 4, 4 6, 6 6, 6 4, 4 4 ) ), ( (0 2,1 2,1 3,0 3,0 2) ) ) '), ST_GEOMFROMTEXT(' POLYGON( ( 6 6, 5 8, 0 8, 8 1, 7 6, 6 6 ) ) ') ) ) ) <> '' c;

--echo #
--echo # Start of 12.3 tests
--echo #

CREATE TABLE t0 (c0 INT,c1 POINT);
INSERT INTO t0 VALUES (-4, Point(0,0));
INSERT INTO t0 VALUES (6, NULL);
INSERT INTO t0 VALUES (9, Point(1,1));
SELECT ST_ISVALID(t0.c1) FROM t0;
SELECT ST_ASTEXT(t0.c1) FROM t0;
DROP TABLE t0;

--echo # End of 12.3 tests
6 changes: 2 additions & 4 deletions sql/item_geofunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,23 +2135,21 @@ longlong Item_func_isvalid::val_int()
String *wkb= args[0]->val_str(&tmp);
Geometry_buffer buffer;
Geometry *geometry;
null_value= 1;

int valid;
if ((args[0]->null_value ||
!(geometry= Geometry::construct(&buffer, wkb->ptr(), wkb->length()))))
Comment thread
DaveGosselin-MariaDB marked this conversation as resolved.
{
if (!args[0]->null_value)
my_error(ER_GIS_INVALID_DATA, MYF(0), func_name());
null_value= 1;
return 1;
}

if (geometry->is_valid(&valid))
{
null_value= 1;
return 1;
}

null_value= 0;
return (longlong) valid;
}

Expand Down