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

Merge pull request #1071 from Silvertree2010/fix/h923-opc-target-resolution-cuts-a-par

Browse Source 
Strip URI fragment before percent-decoding OPC targets
This commit is contained in:
skylar taylor-barrick
2026-10-22 07:50:09 -06:00
committed by GitHub
parent 3f399dd450 e37267f548
commit d01254cf2d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pptx/src/opc.rs
+8 -2
View File
@@ -281,8 +281,8 @@ fn percent_decode(s: &str) -> String {
/// Resolve a relative target against a base directory into a part name.
pub fn resolve(base: &str, target: &str) -> String {
let target = percent_decode(target);
let target = target.split('#').next().unwrap_or("");
let target = percent_decode(target.split('#').next().unwrap_or(""));
let target = target.as_str();
let mut segs: Vec<&str> = if target.starts_with('/') { vec![] } else { base.split('/').filter(|s| !s.is_empty()).collect() };
for s in target.split('/') {
match s {
@@ -441,6 +441,12 @@ impl PackageOut {
mod tests {
use super::*;
#[test]
fn resolve_keeps_encoded_hash_and_strips_fragment() {
assert_eq!(resolve("ppt/slides", "../media/a%23b.png"), "ppt/media/a#b.png");
assert_eq!(resolve("ppt/slides", "../media/a.png#frag"), "ppt/media/a.png");
}
fn zip_of(entries: &[(&str, usize)]) -> Vec<u8> {
let mut zw = zip::ZipWriter::new(Cursor::new(Vec::new()));
let o = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);