Merge pull request #40327 from pkdawson/patch-1

Avoid overflow when calculating visible_cells
godotengine · Jul 14, 2020 · 2921827 · 2921827
2 parents c2ed367 + 9e28df2
commit 2921827
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
@@ -211,7 +211,7 @@ struct SpatialIndexer2D {
 			List<VisibilityNotifier2D *> added;
 			List<VisibilityNotifier2D *> removed;
 
-			int visible_cells = (end.x - begin.x) * (end.y - begin.y);
+			uint64_t visible_cells = (uint64_t)(end.x - begin.x) * (uint64_t)(end.y - begin.y);
 
 			if (visible_cells > 10000) {
 				//well you zoomed out a lot, it's your problem. To avoid freezing in the for loops below, we'll manually check cell by cell