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

Auto merge of #8552 - michaelwu:avoid_overflow, r=glennw

Browse source 
Avoid overflow in freetype/font_context.rs

When new_actual_size < old_actual_size, there is an overflow panic since we're using usize. This breaks Reddit for me.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8552)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-17 13:04:47 +05:30
commit 8950345e0e
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/gfx/platform/freetype/font_context.rs
View file

@ -57,7 +57,8 @@ extern fn ft_realloc(mem: FT_Memory, _cur_size: c_long, new_req_size: c_long,
let new_actual_size = heap_size_of(new_ptr);
let user = (*mem).user as *mut User;
(*user).size += new_actual_size - old_actual_size;
(*user).size += new_actual_size;
(*user).size -= old_actual_size;
new_ptr
}