Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash caused by arithmetic underflow in layout2020 (#30897)

Browse source 
* fix crash caused by arithmetic underflow

* add WPT crash test to avoid regressions

* update manifest

* apply martin's patch

* remove wpt test
This commit is contained in:
atbrakhi 2023-12-21 10:16:23 +01:00 • committed by GitHub
parent abb017b854
commit a9bf29cf8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout_2020/flow/inline.rs
View file

@ -535,23 +535,23 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
// there is no line wrapping, so this forces the segment into the current line.
self.commit_current_segment_to_line();
// This has the effect of preventing the application of `text-align: justify` to
// this line because no justification opportunities means no justification.
self.current_line.justification_opportunities = 0;
// Finally we finish the line itself and convert all of the LineItems into
// fragments.
self.finish_current_line_and_reset();
self.finish_current_line_and_reset(true /* last_line */);
}
/// Finish layout of all inline boxes for the current line. This will gather all
/// [`LineItem`]s and turn them into [`Fragment`]s, then reset the
/// [`InlineFormattingContextState`] preparing it for laying out a new line.
fn finish_current_line_and_reset(&mut self) {
fn finish_current_line_and_reset(&mut self, last_line: bool) {
let whitespace_trimmed = self.current_line.trim_trailing_whitespace();
let (inline_start_position, justification_adjustment) = self
let (inline_start_position, mut justification_adjustment) = self
.calculate_current_line_inline_start_and_justification_adjustment(whitespace_trimmed);
if last_line {
justification_adjustment = Length::zero();
}
let block_start_position = self
.current_line
.line_block_start_considering_placement_among_floats();
@ -1029,7 +1029,7 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
&self.current_line,
self.inline_box_state_stack.len(),
);
self.finish_current_line_and_reset();
self.finish_current_line_and_reset(false /* last_line */);
}
/// Process a soft wrap opportunity. This will either commit the current unbreakble