Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7279 - pcwalton:tile-image-divide-by-zero, r=mbrubeck

Browse source 
layout: Avoid a division by zero in `tile_image()`.

Fixes a crash on Facebook Timeline.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7279)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-19 04:41:54 -06:00
commit 0234bbe444
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/fragment.rs
View file

@ -390,9 +390,13 @@ impl ImageFragmentInfo {
}
/// Tile an image
pub fn tile_image(position: &mut Au, size: &mut Au,
virtual_position: Au, image_size: u32) {
pub fn tile_image(position: &mut Au, size: &mut Au, virtual_position: Au, image_size: u32) {
// Avoid division by zero below!
let image_size = image_size as i32;
if image_size == 0 {
return
}
let delta_pixels = (virtual_position - *position).to_px();
let tile_count = (delta_pixels + image_size - 1) / image_size;
let offset = Au::from_px(image_size * tile_count);

9
tests/ref/background_size_zero_a.html Normal file
View file

@ -0,0 +1,9 @@
<!DOCTYPE html>
<style>
body {
background-image: url(400x400_green.png);
background-size: 0 0;
}
</style>
Don't crash!

3
tests/ref/background_size_zero_ref.html Normal file
View file

@ -0,0 +1,3 @@
<!DOCTYPE html>
Don't crash!

1
tests/ref/basic.list
View file

@ -38,6 +38,7 @@ flaky_cpu == append_style_a.html append_style_b.html
== background_repeat_y_a.html background_repeat_y_b.html
== background_size_a.html background_size_ref.html
== background_size_shorthand_a.html background_size_shorthand_ref.html
== background_size_zero_a.html background_size_zero_ref.html
== background_style_attr.html background_ref.html
== basic_width_px.html basic_width_em.html
== block_formatting_context_a.html block_formatting_context_ref.html