thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UBSan report in pointInPolygon

Browse Source
This commit is contained in:
Alexey Milovidov 2021-07-09 06:06:21 +03:00
parent 7c17e2526d
commit 9290d6f112
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Functions/PolygonUtils.h
View File

@ -6,6 +6,7 @@
#include <Columns/IColumn.h> #include <Columns/IColumn.h>
#include <Columns/ColumnVector.h> #include <Columns/ColumnVector.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
#include <Common/NaNUtils.h>
#include <Common/SipHash.h> #include <Common/SipHash.h>
#include <common/range.h> #include <common/range.h>
@ -304,6 +305,13 @@ void PointInPolygonWithGrid<CoordinateType>::calcGridAttributes(
y_scale = 1 / cell_height; y_scale = 1 / cell_height;
x_shift = -min_corner.x(); x_shift = -min_corner.x();
y_shift = -min_corner.y(); y_shift = -min_corner.y();
if (!(isFinite(x_scale)
&& isFinite(y_scale)
&& isFinite(x_shift)
&& isFinite(y_shift)
&& isFinite(grid_size)))
throw Exception("Polygon is not valid: bounding box is unbounded", ErrorCodes::BAD_ARGUMENTS);
} }
template <typename CoordinateType> template <typename CoordinateType>
@ -358,7 +366,7 @@ bool PointInPolygonWithGrid<CoordinateType>::contains(CoordinateType x, Coordina
if (has_empty_bound) if (has_empty_bound)
return false; return false;
if (std::isnan(x) || std::isnan(y)) if (!isFinite(x) || !isFinite(y))
return false; return false;
CoordinateType float_row = (y + y_shift) * y_scale; CoordinateType float_row = (y + y_shift) * y_scale;

1
tests/queries/0_stateless/01940_point_in_polygon_ubsan.reference Normal file
View File

@ -0,0 +1 @@
0

2
tests/queries/0_stateless/01940_point_in_polygon_ubsan.sql Normal file
View File

@ -0,0 +1,2 @@
SET validate_polygons = 0;
SELECT pointInPolygon((-inf, 1023), [(10.000100135803223, 10000000000.), (inf, 0.9998999834060669), (1.1920928955078125e-7, 100.0000991821289), (1.000100016593933, 100.0000991821289)]);