Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/ini.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,13 @@ impl Ini {
current_key = Some(key.clone());
}

let value = trimmed[delimiter + 1..].trim().to_owned();
// `delimiter` is a byte offset and may itself be multi-byte, so advance by
// its UTF-8 length.
let delimiter_len = trimmed[delimiter..]
.chars()
.next()
.map_or(1, char::len_utf8);
let value = trimmed[delimiter + delimiter_len..].trim().to_owned();

valmap.insert(key, Some(value));
}
Expand Down
15 changes: 15 additions & 0 deletions tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -973,3 +973,18 @@ fn serde_case_sensitive_roundtrip() -> Result<(), Box<dyn Error>> {

Ok(())
}

#[test]
fn multibyte_delimiter_does_not_panic() -> Result<(), Box<dyn Error>> {
use configparser::ini::IniDefault;

// A multi-byte delimiter must not split on a non-char boundary.
let mut defaults = IniDefault::default();
defaults.delimiters = vec!['\u{00a7}']; // section sign, 2 bytes in UTF-8

let mut config = Ini::new_from_defaults(defaults);
config.read(String::from("[s]\nkey\u{00a7}value\n"))?;

assert_eq!(config.get("s", "key"), Some(String::from("value")));
Ok(())
}
Loading