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

Clamp the repeat numbers greater than 10000

Browse source 
This was causing a crash in gecko mochitest because of OOM.
This commit is contained in:
Nazım Can Altınova 2017-07-18 11:11:37 -07:00
parent 1ab86a46b6
commit 3f10488da1
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/style/properties/shorthand/position.mako.rs
View file

@ -252,7 +252,6 @@
-> Result<(GridTemplateComponent,
GridTemplateComponent,
Either<TemplateAreas, None_>), ParseError<'i>> {
// Other shorthand sub properties also parse `none` and `subgrid` keywords and this
// shorthand should know after these keywords there is nothing to parse. Otherwise it
// gets confused and rejects the sub properties that contains `none` or `subgrid`.

7
components/style/values/generics/grid.rs
View file

@ -354,8 +354,13 @@ pub enum RepeatCount {
impl Parse for RepeatCount {
fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
if let Ok(i) = input.try(|i| Integer::parse(context, i)) {
// Maximum number of repeat is 10000. The greater numbers should be clamped.
const MAX_LINE: i32 = 10000;
if let Ok(mut i) = input.try(|i| Integer::parse(context, i)) {
if i.value() > 0 {
if i.value() > MAX_LINE {
i = Integer::new(MAX_LINE);
}
Ok(RepeatCount::Number(i))
} else {
Err(StyleParseError::UnspecifiedError.into())