DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Saturate footnote and endnote numbering at u32::MAX
NetterSilverf0ce96138c6c
diff --git a/crates/compose/src/notes.rs b/crates/compose/src/notes.rsindex 2a465fbfa..02878e65a 100644--- a/crates/compose/src/notes.rs+++ b/crates/compose/src/notes.rs@@ -130,7 +130,7 @@ impl Notes {self.num = o.start_at;}self.numbers[k] = self.num;- self.num += 1;+ self.num = self.num.saturating_add(1);sub.notes.insert(self.refs[k], o.label(self.numbers[k], false));}sub.note_position = o.ref_position;diff --git a/crates/doc/src/endnotes.rs b/crates/doc/src/endnotes.rsindex da213d08c..0d54d2379 100644--- a/crates/doc/src/endnotes.rs+++ b/crates/doc/src/endnotes.rs@@ -147,7 +147,7 @@ impl crate::Document {if st.id == sid {break;}- n += st.endnotes.len() as u32;+ n = n.saturating_add(st.endnotes.len() as u32);}n}diff --git a/crates/doc/src/notes.rs b/crates/doc/src/notes.rsindex c4d83969a..0811c549c 100644--- a/crates/doc/src/notes.rs+++ b/crates/doc/src/notes.rs@@ -262,7 +262,7 @@ impl crate::Document {let Some(me) = self.story(sid) else { return o.start_at };let mine = key(me);let before: usize = self.stories.values().filter(|st| st.id != sid && !st.notes.is_empty() && key(st) < mine).map(|st| st.notes.len()).sum();- o.start_at + before as u32+ o.start_at.saturating_add(before as u32)}/// Absolute page an item sits on (its center), None on parent pages / pasteboard-only spreads.diff --git a/crates/engine/src/cmd/notes.rs b/crates/engine/src/cmd/notes.rsindex 9318458de..03dde5c40 100644--- a/crates/engine/src/cmd/notes.rs+++ b/crates/engine/src/cmd/notes.rs@@ -221,4 +221,15 @@ mod tests {// Caret is now in footnote text: no nested footnotes.assert!(s.execute("footnote.insert", &json!({})).is_err());}++ #[test]+ fn huge_start_at_does_not_overflow() {+ let (mut s, sid) = session_with_text();+ s.execute("text.select", &json!({"story": sid.0, "anchor": 16, "focus": 16})).unwrap();+ s.execute("footnote.insert", &json!({"text": "x"})).unwrap();+ s.execute("footnote.options", &json!({"startAt": 4294967295u32})).unwrap();+ let d = s.doc().unwrap().doc.clone();+ let cs = s.cache.get(&d, sid, None);+ assert_eq!(cs.frames[0].notes.len(), 1);+ }}