aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-10-25 02:37:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1188 from Silvertree2010/fix/h2391-docx-import-stores-nan-inf-font

Browse Source 
Ignore non-finite w:sz, w:spacing and w:ind values in DOCX import
This commit is contained in:
Brandon Thomas
2026-10-19 02:50:07 -04:00
committed by GitHub
parent 5442d648eb 2cc21e19b2
commit bc57f5c9c1
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/textimport/src/docx.rs
+24 -2
View File
@@ -180,7 +180,7 @@ fn run_attrs(rpr: Option<&El>) -> CharAttrs {
if let Some(s) = r.on("strike") {
a.strikethrough = Some(s);
}
if let Some(sz) = r.val("sz").and_then(|v| v.parse::<f64>().ok()) {
if let Some(sz) = r.val("sz").and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()) {
a.size = Some(sz / 2.0);
}
if let Some(f) = r.child("rFonts").and_then(|f| f.attr("ascii").or(f.attr("hAnsi"))) {
@@ -203,7 +203,7 @@ fn run_attrs(rpr: Option<&El>) -> CharAttrs {
fn para_attrs(ppr: Option<&El>) -> ParaAttrs {
let mut a = ParaAttrs::default();
let Some(p) = ppr else { return a };
let tw = |v: Option<&str>| v.and_then(|v| v.parse::<f64>().ok()).map(|v| v / 20.0);
let tw = |v: Option<&str>| v.and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()).map(|v| v / 20.0);
if let Some(sp) = p.child("spacing") {
a.space_before = tw(sp.attr("before"));
a.space_after = tw(sp.attr("after"));
@@ -680,6 +680,28 @@ mod tests {
assert_eq!(st.text, "Date: 1 May 2026.\nLink");
}
/// `str::parse::<f64>` accepts "NaN"/"inf"; sizes, spacing and indents must ignore them.
#[test]
fn non_finite_sizes_spacing_and_indents_are_ignored() {
let document = format!(
r#"<w:document {W}><w:body>
<w:p><w:pPr><w:spacing w:before="NaN" w:after="inf"/><w:ind w:left="-inf" w:right="NaN" w:firstLine="-inf"/></w:pPr>
<w:r><w:rPr><w:sz w:val="NaN"/></w:rPr><w:t>a</w:t></w:r><w:r><w:rPr><w:sz w:val="inf"/></w:rPr><w:t>b</w:t></w:r></w:p>
<w:p><w:pPr><w:ind w:hanging="inf"/></w:pPr><w:r><w:t>c</w:t></w:r></w:p>
</w:body></w:document>"#
);
let st = import(&docx(&document, "", "")).unwrap().story;
let fin = |v: Option<f64>| v.is_none_or(f64::is_finite);
for p in &st.paras {
let p = &p.para;
assert!(fin(p.space_before) && fin(p.space_after), "{p:?}");
assert!(fin(p.left_indent) && fin(p.right_indent) && fin(p.first_line_indent), "{p:?}");
}
for at in [0, 1] {
assert!(fin(st.format_after(at).over.size), "{:?}", st.format_after(at).over.size);
}
}
#[test]
fn tracked_changes_import_as_accepted_including_moves() {
// Regression (#256): text in a tracked move destination (`w:moveTo`) vanished on import.