From 23ba5c8d470c97d4801757ea5252bc5185d8b935 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 22:22:39 -0500 Subject: [PATCH] SVG: use the shared standard Base64 encoder (#8280) --- Cargo.lock | 11 +++++++++++ Cargo.toml | 1 + crates/svg/Cargo.toml | 1 + crates/svg/src/lib.rs | 26 +++++++++++++++----------- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f6a975bae..3a91211871 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1203,6 +1203,16 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-mime" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd#a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" +dependencies = [ + "chrono", + "craft-codepage", + "encoding_rs", +] + [[package]] name = "craft-pdf" version = "0.1.0" @@ -7098,6 +7108,7 @@ version = "0.24.1" dependencies = [ "craft-docpath", "craft-image-codecs 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a499742a9389f47d10cdc61e4cdbf4e5f07f48cd)", + "craft-mime", "craft-svg", "data-url", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 53f5ee619b..e246dbf705 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ craft-gzip = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9 craft-affinity = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } # SVG parsing, limits, SVGZ and writer (craft-libs#778). craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "431f704478962677ec47e512754464d372901830", features = ["tree"] } +craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } # EPS container, previews, ASCII85 and DSC comments (craft-libs#778). craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } # DXF tags, reader and writer (craft-libs#778, #926, #927). diff --git a/crates/svg/Cargo.toml b/crates/svg/Cargo.toml index 3ebda15d43..660ef967ad 100644 --- a/crates/svg/Cargo.toml +++ b/crates/svg/Cargo.toml @@ -10,6 +10,7 @@ workspace = true [dependencies] craft-svg = { workspace = true } +craft-mime = { workspace = true } # Which paths stored in documents may be opened. craft-docpath = { workspace = true } vectorcraft-geom = { workspace = true } diff --git a/crates/svg/src/lib.rs b/crates/svg/src/lib.rs index c48257b34c..ad3e91588f 100644 --- a/crates/svg/src/lib.rs +++ b/crates/svg/src/lib.rs @@ -592,17 +592,8 @@ fn fnv1a_from(h: u64, bytes: &[u8]) -> u64 { /// Standard base64 (RFC 4648, with padding). pub fn base64_encode(data: &[u8]) -> String { - const T: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - let mut out = String::with_capacity(data.len().div_ceil(3) * 4); - for c in data.chunks(3) { - let b = [c[0], *c.get(1).unwrap_or(&0), *c.get(2).unwrap_or(&0)]; - let n = (b[0] as u32) << 16 | (b[1] as u32) << 8 | b[2] as u32; - out.push(T[(n >> 18) as usize & 63] as char); - out.push(T[(n >> 12) as usize & 63] as char); - out.push(if c.len() > 1 { T[(n >> 6) as usize & 63] as char } else { '=' }); - out.push(if c.len() > 2 { T[n as usize & 63] as char } else { '=' }); - } - out + // SVG data URLs need one unwrapped line, not MIME's folded base64_lines variant. + craft_mime::transfer::base64(data) } /// Escape text for XML content and attribute values. @@ -704,6 +695,19 @@ mod tests { assert_eq!(base64_encode(b"foobar"), "Zm9vYmFy"); } + #[test] + fn base64_binary_payload_stays_standard_padded_and_unwrapped() { + let data: Vec = (0..=255).collect(); + assert_eq!( + base64_encode(&data), + "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==" + ); + assert_eq!(base64_encode(&[0xfb, 0xff, 0xff]), "+///"); + assert_eq!(base64_encode(&[0xfb]), "+w=="); + assert_eq!(base64_encode(&[0xfb, 0xff]), "+/8="); + assert_eq!(base64_encode(&[0; 60]), "A".repeat(80)); + } + #[test] fn numbers() { assert_eq!(fmt_num(1.0, 3), "1");