From dac3504cc3acb01093864bb573205d9a4d8b130b Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Wed, 20 May 2020 12:32:35 +0100 Subject: [PATCH 1/2] Fix C4724: potential mod by 0 warnings. --- scene/2d/collision_polygon_2d.cpp | 10 ++++--- scene/3d/navigation.cpp | 45 ++++++++++++++++++------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index d9cc94c6eb5..ee92423908c 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -65,9 +65,10 @@ void CollisionPolygon2D::_build_polygon() { segments.resize(polygon.size() * 2); PoolVector::Write w = segments.write(); - for (int i = 0; i < polygon.size(); i++) { + int polygon_count = polygon.size(); + for (int i = 0; i < polygon_count; i++) { w[(i << 1) + 0] = polygon[i]; - w[(i << 1) + 1] = polygon[(i + 1) % polygon.size()]; + w[(i << 1) + 1] = polygon[(i + 1) % polygon_count]; } w.release(); @@ -139,10 +140,11 @@ void CollisionPolygon2D::_notification(int p_what) { break; } - for (int i = 0; i < polygon.size(); i++) { + int polygon_count = polygon.size(); + for (int i = 0; i < polygon_count; i++) { Vector2 p = polygon[i]; - Vector2 n = polygon[(i + 1) % polygon.size()]; + Vector2 n = polygon[(i + 1) % polygon_count]; // draw line with width <= 1, so it does not scale with zoom and break pixel exact editing draw_line(p, n, Color(0.9, 0.2, 0.0, 0.8), 1); } diff --git a/scene/3d/navigation.cpp b/scene/3d/navigation.cpp index 62576b1b829..547f41a74bf 100644 --- a/scene/3d/navigation.cpp +++ b/scene/3d/navigation.cpp @@ -147,12 +147,12 @@ void Navigation::_navmesh_unlink(int p_id) { Polygon &p = E->get(); - int ec = p.edges.size(); + int edge_count = p.edges.size(); Polygon::Edge *edges = p.edges.ptrw(); - for (int i = 0; i < ec; i++) { - int next = (i + 1) % ec; + for (int i = 0; i < edge_count; i++) { + int next = (i + 1) % edge_count; EdgeKey ek(edges[i].point, edges[next].point); Map::Element *C = connections.find(ek); @@ -249,11 +249,12 @@ void Navigation::_clip_path(Vector &path, Polygon *from_poly, const Vec cut_plane.d = cut_plane.normal.dot(from); while (from_poly != p_to_poly) { - + int edge_count = from_poly->edges.size(); + ERR_FAIL_COND_MSG(edge_count == 0, "Polygon has no edges."); int pe = from_poly->prev_edge; - ERR_FAIL_COND(from_poly->edges.size() == 0); + int next = (pe + 1) % edge_count; Vector3 a = _get_vertex(from_poly->edges[pe].point); - Vector3 b = _get_vertex(from_poly->edges[(pe + 1) % from_poly->edges.size()].point); + Vector3 b = _get_vertex(from_poly->edges[next].point); from_poly = from_poly->edges[pe].C; ERR_FAIL_COND(!from_poly); @@ -262,7 +263,7 @@ void Navigation::_clip_path(Vector &path, Polygon *from_poly, const Vec Vector3 inters; if (cut_plane.intersects_segment(a, b, &inters)) { - if (inters.distance_to(p_to_point) > CMP_EPSILON && inters.distance_to(from) > CMP_EPSILON) { + if (inters.distance_to(p_to_point) > CMP_EPSILON && inters.distance_to(path[path.size() - 1]) > CMP_EPSILON) { path.push_back(inters); } } @@ -327,16 +328,18 @@ Vector Navigation::get_simple_path(const Vector3 &p_start, const Vector bool found_route = false; List open_list; + int begin_edge_count = begin_poly->edges.size(); - for (int i = 0; i < begin_poly->edges.size(); i++) { + for (int i = 0; i < begin_edge_count; i++) { if (begin_poly->edges[i].C) { begin_poly->edges[i].C->prev_edge = begin_poly->edges[i].C_edge; #ifdef USE_ENTRY_POINT + int next = (i + 1) % begin_edge_count; Vector3 edge[2] = { _get_vertex(begin_poly->edges[i].point), - _get_vertex(begin_poly->edges[(i + 1) % begin_poly->edges.size()].point) + _get_vertex(begin_poly->edges[next].point) }; Vector3 entry = Geometry::get_closest_point_to_segment(begin_poly->entry, edge); @@ -385,7 +388,8 @@ Vector Navigation::get_simple_path(const Vector3 &p_start, const Vector break; } - for (int i = 0; i < p->edges.size(); i++) { + int edge_count = p->edges.size(); + for (int i = 0; i < edge_count; i++) { Polygon::Edge &e = p->edges.write[i]; @@ -393,9 +397,10 @@ Vector Navigation::get_simple_path(const Vector3 &p_start, const Vector continue; #ifdef USE_ENTRY_POINT + int next = (i + 1) % edge_count; Vector3 edge[2] = { _get_vertex(p->edges[i].point), - _get_vertex(p->edges[(i + 1) % p->edges.size()].point) + _get_vertex(p->edges[next].point) }; Vector3 entry = Geometry::get_closest_point_to_segment(p->entry, edge); @@ -457,9 +462,10 @@ Vector Navigation::get_simple_path(const Vector3 &p_start, const Vector left = begin_point; right = begin_point; } else { + int edge_count = p->edges.size(); + ERR_FAIL_COND_V_MSG(edge_count == 0, Vector(), "Polygon has no edges."); int prev = p->prev_edge; - ERR_FAIL_COND_V(p->edges.size() == 0, Vector()); - int prev_n = (p->prev_edge + 1) % p->edges.size(); + int prev_n = (p->prev_edge + 1) % edge_count; left = _get_vertex(p->edges[prev].point); right = _get_vertex(p->edges[prev_n].point); @@ -531,8 +537,9 @@ Vector Navigation::get_simple_path(const Vector3 &p_start, const Vector #ifdef USE_ENTRY_POINT Vector3 point = p->entry; #else - ERR_FAIL_COND_V(p->edges.size() == 0, Vector()); - int prev_n = (p->prev_edge + 1) % p->edges.size(); + int edge_count = p->edges.size(); + ERR_FAIL_COND_V_MSG(edge_count == 0, Vector(), "Polygon has no edges."); + int prev_n = (p->prev_edge + 1) % edge_count; Vector3 point = (_get_vertex(p->edges[prev].point) + _get_vertex(p->edges[prev_n].point)) * 0.5; #endif path.push_back(point); @@ -585,12 +592,12 @@ Vector3 Navigation::get_closest_point_to_segment(const Vector3 &p_from, const Ve if (!use_collision) { - for (int i = 0; i < p.edges.size(); i++) { + int edge_count = p.edges.size(); + for (int i = 0; i < edge_count; i++) { Vector3 a, b; - - ERR_FAIL_COND_V(p.edges.size() == 0, Vector3()); - Geometry::get_closest_points_between_segments(p_from, p_to, _get_vertex(p.edges[i].point), _get_vertex(p.edges[(i + 1) % p.edges.size()].point), a, b); + int next = (i + 1) % edge_count; + Geometry::get_closest_points_between_segments(p_from, p_to, _get_vertex(p.edges[i].point), _get_vertex(p.edges[next].point), a, b); float d = a.distance_to(b); if (d < closest_point_d) { From aeb1181addca7de00ec2aac9eddc6e358071ad0f Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Thu, 21 May 2020 08:39:14 +0100 Subject: [PATCH 2/2] Enable Appveyor error on warnings. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9df4ab27abc..026a5daab23 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,7 +8,7 @@ environment: SCONS_CACHE_ROOT: "%HOME%\\scons_cache" SCONS_CACHE_LIMIT: 1024 OPTIONS: "debug_symbols=no verbose=yes progress=no" - EXTRA_ARGS: "warnings=all werror=no" + EXTRA_ARGS: "warnings=all werror=yes" matrix: - GD_PLATFORM: windows TARGET: release_debug