diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-14 11:33:35 +0300 |
| commit | cf87f3e08c10dd7a944447ddee93fbc3827e6570 (patch) | |
| tree | 3c81320e2811d99e075f7d03d3bf0d1cdfa48c84 /sql/item_geofunc.cc | |
| parent | 1bf77cde5c62166c0f1652c2a1764e05ce76edb5 (diff) | |
| parent | 2f7b37b02154748b223e385a7d7787900ab37b5e (diff) | |
| download | mariadb-git-cf87f3e08c10dd7a944447ddee93fbc3827e6570.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index c107c93d584..4acf1c6525b 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -2372,12 +2372,15 @@ double Item_func_distance::val_real() MBR mbr1, mbr2; const char *c_end; - - if ((null_value= (args[0]->null_value || args[1]->null_value || - !(g1= Geometry::construct(&buffer1, res1->ptr(), res1->length())) || - !(g2= Geometry::construct(&buffer2, res2->ptr(), res2->length())) || - g1->get_mbr(&mbr1, &c_end) || - g2->get_mbr(&mbr2, &c_end)))) + if (args[0]->null_value || args[1]->null_value) + goto mem_error; + g1= Geometry::construct(&buffer1, res1->ptr(), res1->length()); + if (!g1) + goto mem_error; + g2= Geometry::construct(&buffer2, res2->ptr(), res2->length()); + if (!g2) + goto mem_error; + if (g1->get_mbr(&mbr1, &c_end) || g2->get_mbr(&mbr2, &c_end)) goto mem_error; mbr1.add_mbr(&mbr2); @@ -2526,7 +2529,7 @@ String *Item_func_pointonsurface::val_str(String *str) Geometry *g; MBR mbr; const char *c_end; - double UNINIT_VAR(px), UNINIT_VAR(py), x0, y0; + double UNINIT_VAR(px), UNINIT_VAR(py), x0, UNINIT_VAR(y0); String *result= 0; const Gcalc_scan_iterator::point *pprev= NULL; uint32 srid; |