Skip to content

Fix integer overflows in the damage shaper #1837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix integer overflows in the damage shaper #1837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backend/renderer/damage/shaper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl<const MIN_TILE_SIDE: i32> DamageShaper<MIN_TILE_SIDE> {
in_damage
.iter()
.fold((i32::MAX, i32::MAX, i32::MIN, i32::MIN, i32::MIN), |acc, rect| {
let area = rect.size.w * rect.size.h;
let area = rect.size.w.saturating_mul(rect.size.h);
(
acc.0.min(rect.loc.x),
acc.1.min(rect.loc.y),
Expand All @@ -81,7 +81,7 @@ impl<const MIN_TILE_SIDE: i32> DamageShaper<MIN_TILE_SIDE> {
let damage_bbox = Rectangle::<i32, Physical>::new((x_min, y_min).into(), (bbox_w, bbox_h).into());

// Damage the current bounding box when there's a damage rect covering near all the area.
if max_damage_area as f32 / (damage_bbox.size.w * damage_bbox.size.h) as f32
if max_damage_area as f32 / (damage_bbox.size.w.saturating_mul(damage_bbox.size.h)) as f32
> MAX_DAMAGE_TO_DAMAGE_BBOX_RATIO
{
self.out_damage.push(damage_bbox);
Expand Down