caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-08-26 04:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add guard for potential empty labels from bibliography (#5776)

Browse Source
This commit is contained in:
Said Aroua 2025-05-25 15:50:22 +02:00
parent d90b5623d8
commit 43c3acdc4e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/typst-library/src/foundations/label.rs
View File

@ -54,7 +54,9 @@ pub struct Label(PicoStr);
impl Label {
/// Creates a label from an interned string.
/// Callers need to ensure the given string is not empty.
pub fn new(name: PicoStr) -> Self {
debug_assert!(name != PicoStr::EMPTY);
Self(name)
}

9
crates/typst-library/src/model/bibliography.rs
View File

@ -313,12 +313,17 @@ impl Bibliography {
for (source, data) in sources.0.iter().zip(data) {
let library = decode_library(source, data)?;
for entry in library {
match map.entry(Label::new(PicoStr::intern(entry.key()))) {
let key = entry.key();
if key.is_empty() {
bail!("empty bibliography key found");
}
match map.entry(Label::new(PicoStr::intern(key))) {
indexmap::map::Entry::Vacant(vacant) => {
vacant.insert(entry);
}
indexmap::map::Entry::Occupied(_) => {
duplicates.push(entry.key().into());
duplicates.push(key.into());
}
}
}

3
crates/typst-utils/src/pico.rs
View File

@ -38,6 +38,9 @@ struct Interner {
pub struct PicoStr(NonZeroU64);
impl PicoStr {
/// Empty string as PicoStr
pub const EMPTY: PicoStr = PicoStr::constant("");
/// Intern a string at runtime.
pub fn intern(string: &str) -> PicoStr {
// Try to use bitcode or exception representations.