daniel543x/pdfcraft
1
0 Fork 0
mirror of https://github.com/storytold/pdfcraft.git synced 2026-10-31 07:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop rewriting shared Type 3 CharProcs in place and clear emptied fonts

Browse Source 
A CharProcs object can be shared by two Type 3 fonts. Filtering it in place let
the first font strip glyphs the second still drew, so each font now gets its own
filtered CharProcs. Fonts with no surviving glyphs also drop their CharProcs and
Resources before the holder references are removed.
This commit is contained in:
Dylan M. Taylor committed 2026-10-26 12:32:19 -04:00
1 parent 0a7b4b529b
commit bb38809ef4
1 file changed
+12 -10
Download Patch File Download Diff File Expand all files Collapse all files
crates/redact/src/type3.rs
+12 -10
View File
@@ -557,7 +557,6 @@ fn clean_type3_font(
let Some(char_procs_val) = font_dict.get(b"CharProcs") else {
return Err(CosError::Syntax { offset: 0, detail: "redaction could not establish safe Type 3 font cleanup: missing CharProcs".into() }.into());
};
let char_procs_ref = char_procs_val.as_ref();
let mut char_procs = doc.resolve(char_procs_val).as_dict().cloned().ok_or_else(|| CosError::Syntax {
offset: 0,
detail: "redaction could not establish safe Type 3 font cleanup: CharProcs is not a dict".into(),
@@ -572,20 +571,23 @@ fn clean_type3_font(
}
}
let FontKey::Ref(fr) = font_key;
if char_procs.is_empty() {
// The font has no surviving glyphs: remove font from /Font across all holders.
// The font has no surviving glyphs: clear its own glyph programs and resources, then
// remove font from /Font across all holders.
doc.update_dict(*fr, |d| {
d.remove(b"CharProcs");
d.remove(b"Resources");
})?;
return remove_font_from_holders(doc, holders, form_holders, font_key);
}
let FontKey::Ref(fr) = font_key;
// A CharProcs object can be shared with another Type 3 font, so never rewrite it in place:
// give this font its own filtered dictionary instead.
if procs_changed {
if let Some(r) = char_procs_ref {
doc.update_dict(r, |d| *d = char_procs.clone())?;
} else {
doc.update_dict(*fr, |d| {
d.set(b"CharProcs".to_vec(), Object::Dict(char_procs.clone()));
})?;
}
doc.update_dict(*fr, |d| {
d.set(b"CharProcs".to_vec(), Object::Dict(char_procs.clone()));
})?;
}
// Clean exclusive resources from the Type 3 font's /Resources.