Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-17 04:13:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bail out gracefully on malformed kern table headers.

Browse source 
Fixes #12081.
This commit is contained in:
Matt Brubeck 2016-07-06 08:16:37 -07:00
parent 4aaae7a4e6
commit 5582fcc219
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/gfx/platform/macos/font.rs
View file

@ -113,11 +113,14 @@ impl FontHandle {
let pair_data_start = subtable_start + FORMAT_0_HEADER_LEN; let pair_data_start = subtable_start + FORMAT_0_HEADER_LEN;
result.pair_data_range = pair_data_start..end; result.pair_data_range = pair_data_start..end;
if result.pair_data_range.len() != n_pairs * KERN_PAIR_LEN {
debug!("Bad data in kern header. Disable fast path.");
return None;
}
let pt_per_font_unit = self.ctfont.pt_size() as f64 / let pt_per_font_unit = self.ctfont.pt_size() as f64 /
self.ctfont.units_per_em() as f64; self.ctfont.units_per_em() as f64;
result.px_per_font_unit = pt_to_px(pt_per_font_unit); result.px_per_font_unit = pt_to_px(pt_per_font_unit);
debug_assert_eq!(n_pairs * KERN_PAIR_LEN, result.pair_data_range.len());
} }
start = end; start = end;
} }