sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3838 from mapycz/fix-crash-polygon_vertex_adapter

Browse source 
Fix crash in polygon_vertex_adapter
This commit is contained in:
Artem Pavlenko 2018-01-23 16:35:09 +01:00 • committed by GitHub
commit 2461058ecc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vertex_adapters.cpp
View file

@ -145,6 +145,12 @@ unsigned polygon_vertex_adapter<T>::vertex(coordinate_type * x, coordinate_type
{
current_index_ = 0;
end_index_ = poly_[rings_itr_].size();
if (end_index_ == 0)
{
*x = 0;
*y = 0;
return mapnik::SEG_CLOSE;
}
point<T> const& coord = poly_[rings_itr_][current_index_++];
*x = coord.x;
*y = coord.y;

66
test/unit/vertex_adapter/vertex_adapter.cpp
View file

@ -268,4 +268,70 @@ SECTION("polygon with hole") {
REQUIRE( y == 0 );
}
SECTION("polygon with empty exterior ring") {
mapnik::geometry::polygon<double> g;
g.emplace_back();
mapnik::geometry::polygon_vertex_adapter<double> va(g);
double x,y;
unsigned cmd;
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_END );
CHECK( x == Approx(0) );
CHECK( y == Approx(0) );
}
SECTION("polygon with empty interior ring") {
mapnik::geometry::polygon<double> g;
g.emplace_back();
g.back().emplace_back(-1, -1);
g.back().emplace_back( 1, -1);
g.back().emplace_back( 1, 1);
g.back().emplace_back(-1, 1);
g.back().emplace_back(-1, -1);
// Emplace empty interior ring
g.emplace_back();
mapnik::geometry::polygon_vertex_adapter<double> va(g);
double x,y;
unsigned cmd;
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_MOVETO );
CHECK( x == Approx(-1) );
CHECK( y == Approx(-1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_LINETO );
CHECK( x == Approx(1) );
CHECK( y == Approx(-1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_LINETO );
CHECK( x == Approx(1) );
CHECK( y == Approx(1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_LINETO );
CHECK( x == Approx(-1) );
CHECK( y == Approx(1) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_CLOSE );
CHECK( x == Approx(0) );
CHECK( y == Approx(0) );
cmd = va.vertex(&x,&y);
CHECK( cmd == mapnik::SEG_CLOSE );
CHECK( x == Approx(0) );
CHECK( y == Approx(0) );
cmd = va.vertex(&x,&y);
REQUIRE( cmd == mapnik::SEG_END );
REQUIRE( x == Approx(0) );
REQUIRE( y == Approx(0) );
}
}