From af3d48e5b34305b262ee5d1ba35d1ad9ff79794d Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 13 Dec 2016 16:19:38 -0800 Subject: [PATCH] Fix integer overflow identified by -fsanitize=integer --- geometry.cpp | 4 ++-- tile.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/geometry.cpp b/geometry.cpp index 7e1b203..8e235b3 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -1376,8 +1376,8 @@ drawvec stairstep(drawvec &geom, int z, int detail) { } for (size_t i = 0; i < out.size(); i++) { - out[i].x <<= (32 - detail - z); - out[i].y <<= (32 - detail - z); + out[i].x *= 1 << (32 - detail - z); + out[i].y *= 1 << (32 - detail - z); } return out; diff --git a/tile.cpp b/tile.cpp index ae34f16..c61859c 100644 --- a/tile.cpp +++ b/tile.cpp @@ -726,12 +726,12 @@ bool find_common_edges(std::vector &partials, int z, int line_detail, d if (s > 0) { drawvec left; - if (g[a + (0 - 1 + s) % s] < g[a + 0]) { - left.push_back(g[a + (0 - 1 + s) % s]); - left.push_back(g[a + 0]); + if (g[a + (s - 1) % s] < g[a]) { + left.push_back(g[a + (s - 1) % s]); + left.push_back(g[a]); } else { - left.push_back(g[a + 0]); - left.push_back(g[a + (0 - 1 + s) % s]); + left.push_back(g[a]); + left.push_back(g[a + (s - 1) % s]); } if (left[1] < left[0]) { fprintf(stderr, "left misordered\n"); @@ -878,8 +878,8 @@ bool find_common_edges(std::vector &partials, int z, int line_detail, d partials[i].arc_polygon.push_back(added); merge_candidates.insert(std::pair(added, i)); } else { - partials[i].arc_polygon.push_back(-f2->second); - merge_candidates.insert(std::pair(-f2->second, i)); + partials[i].arc_polygon.push_back(-(ssize_t) f2->second); + merge_candidates.insert(std::pair(-(ssize_t) f2->second, i)); } } else { partials[i].arc_polygon.push_back(f->second);