diff --git a/crates/docx/src/read/story/blocks.rs b/crates/docx/src/read/story/blocks.rs
index 38c35a02b..878429454 100644
--- a/crates/docx/src/read/story/blocks.rs
+++ b/crates/docx/src/read/story/blocks.rs
@@ -249,10 +249,11 @@ impl Reader<'_> {
.unwrap_or_default();
para.props.fmt_change = PropChange::boxed(self.revision(RevisionKind::Format, ch), old);
}
- if para.props.numbering.is_some()
- && let Some(ch) = ppr.child("w:numPr").and_then(|n| n.child("w:numberingChange"))
- {
- let original = ch.attr("w:original").unwrap_or("").chars().take(256).collect();
+ if let Some(ch) = ppr.child("w:numPr").and_then(|n| n.child("w:numberingChange")) {
+ // Multi-level numbering caches (`w:original`) routinely exceed 256 chars while staying
+ // bounded against hostile attributes.
+ const MAX_CHANGE_ORIGINAL: usize = 4096;
+ let original = ch.attr("w:original").unwrap_or("").chars().take(MAX_CHANGE_ORIGINAL).collect();
para.props.num_change = Some(Box::new(NumChange { rev: self.revision(RevisionKind::Format, ch), original }));
}
if let Some(s) = ppr.child("w:sectPr") {
diff --git a/crates/docx/src/write/props.rs b/crates/docx/src/write/props.rs
index 0a64fc20a..0b92ce191 100644
--- a/crates/docx/src/write/props.rs
+++ b/crates/docx/src/write/props.rs
@@ -261,10 +261,12 @@ pub fn ppr_inner(w: &mut W, p: &ParaProps, framed: bool, num_change: Option<&Cha
toggle(w, "w:pageBreakBefore", p.page_break_before);
write_frame(w, p, framed);
toggle(w, "w:widowControl", p.widow_control);
- if let Some(nr) = p.numbering {
+ if p.numbering.is_some() || num_change.is_some() {
w.open("w:numPr", &[]);
- w.val("w:ilvl", &n(nr.level.min(8) as i64));
- w.val("w:numId", &n(nr.num as i64));
+ if let Some(nr) = p.numbering {
+ w.val("w:ilvl", &n(nr.level.min(8) as i64));
+ w.val("w:numId", &n(nr.num as i64));
+ }
if let Some(a) = num_change {
let refs: Vec<(&str, &str)> = a.iter().map(|(k, v)| (*k, v.as_str())).collect();
w.empty("w:numberingChange", &refs);
diff --git a/crates/docx/tests/it/fixtures.rs b/crates/docx/tests/it/fixtures.rs
index 868e8cbb0..348d6239e 100644
--- a/crates/docx/tests/it/fixtures.rs
+++ b/crates/docx/tests/it/fixtures.rs
@@ -2197,6 +2197,50 @@ fn formatting_revisions_round_trip() {
assert_eq!(again.revisions, d.revisions);
}
+#[test]
+fn numbering_change_without_active_list_roundtrips() {
+ let body = r#"Removed"#;
+ let d = read_body(body);
+ let p = paras(&d);
+ assert_eq!(p.len(), 1);
+ assert!(p[0].props.numbering.is_none());
+ let nc = p[0].props.num_change.as_deref().expect("numberingChange read back");
+ assert_eq!(nc.original, "%1:1:0:.");
+
+ let bytes = craft_docx::write(&d).unwrap();
+ let mut zip = zip::ZipArchive::new(std::io::Cursor::new(&bytes)).unwrap();
+ let mut xml = String::new();
+ std::io::Read::read_to_string(&mut zip.by_name("word/document.xml").unwrap(), &mut xml).unwrap();
+ assert!(xml.contains(r#""#), "{xml}");
+
+ let again = craft_docx::read(&bytes).unwrap();
+ let ap = paras(&again);
+ assert!(ap[0].props.numbering.is_none());
+ let anc = ap[0].props.num_change.as_deref().expect("numberingChange preserved after save");
+ assert_eq!(anc.original, "%1:1:0:.");
+}
+
+#[test]
+fn numbering_change_original_preserves_long_values_within_bound() {
+ let long_orig = "%1:1:0:.".repeat(64); // 512 chars, well past the old 256-char cap
+ assert!(long_orig.len() > 256 && long_orig.len() < 4096);
+ let over_cap = "x".repeat(5000);
+ let body = format!(
+ r#"Long
+Bounded"#
+ );
+ let d = read_body(&body);
+ let p = paras(&d);
+ assert_eq!(p[0].props.num_change.as_deref().map(|n| n.original.as_str()), Some(long_orig.as_str()));
+ assert_eq!(p[1].props.num_change.as_deref().map(|n| n.original.chars().count()), Some(4096));
+
+ let bytes = craft_docx::write(&d).unwrap();
+ let again = craft_docx::read(&bytes).unwrap();
+ let ap = paras(&again);
+ assert_eq!(ap[0].props.num_change.as_deref().map(|n| n.original.as_str()), Some(long_orig.as_str()));
+}
+
/// A package with `styles`, a theme (accent1 4472C4, accent2 ED7D31, major font "Major Face") and,
/// when given, `settings`.
fn themed_docx(body: &str, styles: &str, settings: Option<&str>) -> Document {