Skip to content

Commit

Permalink
Check that some blue zone lists are pairs
Browse files Browse the repository at this point in the history
  • Loading branch information
@madig
madig committed Jan 14, 2022
1 parent 2789dbe commit d9888dc
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 4 deletions.
5 changes: 5 additions & 0 deletions src/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ pub enum FontInfoErrorKind {
/// The found number of elements.
len: usize,
},
/// A Postscript data list must contain pairs.
PostscriptListMustBePairs(&'static str),
/// Unrecognized UFO v1 fontStyle field.
UnknownFontStyle(i32),
/// Unrecognized UFO v1 msCharSet field.
Expand Down Expand Up @@ -226,6 +228,9 @@ impl std::fmt::Display for FontInfoErrorKind {
name, max_len, len
)
}
PostscriptListMustBePairs(name) => {
write!(f, "the Postscript field '{}' must contain pairs", name)
}
UnknownFontStyle(s) => {
write!(f, "unrecognized fontStyle '{}'", s)
}
Expand Down
108 changes: 104 additions & 4 deletions src/fontinfo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,40 +888,56 @@ impl FontInfo {

// The Postscript blue zone and stem widths lists have a length limitation.
if let Some(v) = &self.postscript_blue_values {
let name = "postscriptBlueValues";
if v.len() > 14 {
return Err(FontInfoErrorKind::InvalidPostscriptListLength {
name: "postscriptBlueValues",
name,
max_len: 14,
len: v.len(),
});
}
if v.len() % 2 != 0 {
return Err(FontInfoErrorKind::PostscriptListMustBePairs(name));
}
}
if let Some(v) = &self.postscript_other_blues {
let name = "postscriptOtherBlues";
if v.len() > 10 {
return Err(FontInfoErrorKind::InvalidPostscriptListLength {
name: "postscriptOtherBlues",
name,
max_len: 10,
len: v.len(),
});
}
if v.len() % 2 != 0 {
return Err(FontInfoErrorKind::PostscriptListMustBePairs(name));
}
}
if let Some(v) = &self.postscript_family_blues {
let name = "postscriptFamilyBlues";
if v.len() > 14 {
return Err(FontInfoErrorKind::InvalidPostscriptListLength {
name: "postscriptFamilyBlues",
name,
max_len: 14,
len: v.len(),
});
}
if v.len() % 2 != 0 {
return Err(FontInfoErrorKind::PostscriptListMustBePairs(name));
}
}
if let Some(v) = &self.postscript_family_other_blues {
let name = "postscriptFamilyOtherBlues";
if v.len() > 10 {
return Err(FontInfoErrorKind::InvalidPostscriptListLength {
name: "postscriptFamilyOtherBlues",
name,
max_len: 10,
len: v.len(),
});
}
if v.len() % 2 != 0 {
return Err(FontInfoErrorKind::PostscriptListMustBePairs(name));
}
}
if let Some(v) = &self.postscript_stem_snap_h {
if v.len() > 12 {
Expand Down Expand Up @@ -1928,4 +1944,88 @@ mod tests {
assert!(NonNegativeIntegerOrFloat::try_from(-1.0).is_err());
assert!(NonNegativeIntegerOrFloat::try_from(1.0).is_ok());
}

#[test]
fn test_postscript_blue_values_pairs() {
let mut fi = FontInfo {
postscript_blue_values: Some(vec![1.0, 2.0, 3.0, 4.0]),
..Default::default()
};
assert!(fi.validate().is_ok());
fi.postscript_blue_values = Some(vec![]);
assert!(fi.validate().is_ok());
fi.postscript_blue_values = Some(vec![1.0, 2.0, 3.0, 4.0, 5.0]);
assert!(matches!(fi.validate(), Err(FontInfoErrorKind::PostscriptListMustBePairs(_))));
}

#[test]
fn test_postscript_other_blues_pairs() {
let mut fi = FontInfo {
postscript_other_blues: Some(vec![1.0, 2.0, 3.0, 4.0]),
..Default::default()
};
assert!(fi.validate().is_ok());
fi.postscript_other_blues = Some(vec![]);
assert!(fi.validate().is_ok());
fi.postscript_other_blues = Some(vec![1.0, 2.0, 3.0, 4.0, 5.0]);
assert!(matches!(fi.validate(), Err(FontInfoErrorKind::PostscriptListMustBePairs(_))));
}

#[test]
fn test_postscript_family_blues_pairs() {
let mut fi = FontInfo {
postscript_family_blues: Some(vec![1.0, 2.0, 3.0, 4.0]),
..Default::default()
};
assert!(fi.validate().is_ok());
fi.postscript_family_blues = Some(vec![]);
assert!(fi.validate().is_ok());
fi.postscript_family_blues = Some(vec![1.0, 2.0, 3.0, 4.0, 5.0]);
assert!(matches!(fi.validate(), Err(FontInfoErrorKind::PostscriptListMustBePairs(_))));
}

#[test]
fn test_postscript_family_other_blues_pairs() {
let mut fi = FontInfo {
postscript_family_other_blues: Some(vec![1.0, 2.0, 3.0, 4.0]),
..Default::default()
};
assert!(fi.validate().is_ok());
fi.postscript_family_other_blues = Some(vec![]);
assert!(fi.validate().is_ok());
fi.postscript_family_other_blues = Some(vec![1.0, 2.0, 3.0, 4.0, 5.0]);
assert!(matches!(fi.validate(), Err(FontInfoErrorKind::PostscriptListMustBePairs(_))));
}

#[test]
fn test_postscript_stem_snap_h_length() {
let mut fi =
FontInfo { postscript_stem_snap_h: Some([0.0; 11].into()), ..Default::default() };
assert!(fi.validate().is_ok());
fi.postscript_stem_snap_h = Some(vec![]);
assert!(fi.validate().is_ok());
fi.postscript_stem_snap_h = Some([0.0; 12].into());
assert!(fi.validate().is_ok());
fi.postscript_stem_snap_h = Some([0.0; 13].into());
assert!(matches!(
fi.validate(),
Err(FontInfoErrorKind::InvalidPostscriptListLength { name: _, max_len: _, len: _ })
));
}

#[test]
fn test_postscript_stem_snap_v_length() {
let mut fi =
FontInfo { postscript_stem_snap_v: Some([0.0; 11].into()), ..Default::default() };
assert!(fi.validate().is_ok());
fi.postscript_stem_snap_v = Some(vec![]);
assert!(fi.validate().is_ok());
fi.postscript_stem_snap_v = Some([0.0; 12].into());
assert!(fi.validate().is_ok());
fi.postscript_stem_snap_v = Some([0.0; 13].into());
assert!(matches!(
fi.validate(),
Err(FontInfoErrorKind::InvalidPostscriptListLength { name: _, max_len: _, len: _ })
));
}
}

0 comments on commit d9888dc

Please # to comment.