Skip to content

Address parsing should succeed even when last '\n' is absent #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sftse wants to merge 4 commits into
base: main
Choose a base branch
from
+48 −43
Open

Address parsing should succeed even when last '\n' is absent #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cdcf1a
test: addresses without terminating \n should salvage as much text as…
sftse Mar 2, 2026
12b3852
fix: address parsing when last \n is missing
sftse Mar 2, 2026
6c04af9
refactor: remove unwrap
sftse Mar 2, 2026
0c2969c
refactor: needless branching
sftse Mar 2, 2026
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
11 changes: 11 additions & 0 deletions resources/address.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,5 +777,16 @@
}
]
}
},
{
"header": "John Doe",
"expected": {
"List": [
{
"name": "John Doe",
"address": null
}
]
}
}
]
80 changes: 37 additions & 43 deletions src/parsers/fields/address.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,18 @@ impl<'x> MessageStream<'x> {
result: Vec::new(),
};

while let Some(ch) = self.next() {
match ch {
b'\n' => {
loop {
match self.next() {
Some(b'\n') | None => {
parser.add_token(self, false);
if self.try_next_is_space() {
if !parser.is_token_start {
parser.is_token_start = true;
}
parser.is_token_start = true;
continue;
} else {
break;
}
}
b'\\' if parser.state != AddressState::Name && !parser.is_escaped => {
Some(b'\\') if parser.state != AddressState::Name && !parser.is_escaped => {
if parser.token_start > 0 {
if parser.state == AddressState::Quote {
parser.token_end = self.offset() - 1;
Expand All @@ -232,24 +230,24 @@ impl<'x> MessageStream<'x> {
parser.is_escaped = true;
continue;
}
b',' if parser.state == AddressState::Name => {
Some(b',') if parser.state == AddressState::Name => {
parser.add_token(self, false);
parser.add_address();
continue;
}
b'<' if parser.state == AddressState::Name => {
Some(b'<') if parser.state == AddressState::Name => {
parser.is_token_email = false;
parser.add_token(self, false);
parser.state_stack.push(AddressState::Name);
parser.state = AddressState::Address;
continue;
}
b'>' if parser.state == AddressState::Address => {
Some(b'>') if parser.state == AddressState::Address => {
parser.add_token(self, false);
parser.state = parser.state_stack.pop().unwrap();
continue;
}
b'"' if !parser.is_escaped => match parser.state {
Some(b'"') if !parser.is_escaped => match parser.state {
AddressState::Name => {
parser.state_stack.push(AddressState::Name);
parser.state = AddressState::Quote;
Expand All @@ -263,10 +261,12 @@ impl<'x> MessageStream<'x> {
}
_ => (),
},
b'@' if parser.state == AddressState::Name => {
Some(b'@') if parser.state == AddressState::Name => {
parser.is_token_email = true;
}
b'=' if parser.is_token_start && !parser.is_escaped && self.peek_char(b'?') => {
Some(b'=')
if parser.is_token_start && !parser.is_escaped && self.peek_char(b'?') =>
{
self.checkpoint();
if let Some(token) = self.decode_rfc2047() {
let add_space = parser.state != AddressState::Quote; // Make borrow-checker happy
Expand All @@ -281,13 +281,10 @@ impl<'x> MessageStream<'x> {
}
self.restore();
}
b' ' | b'\t' => {
if !parser.is_token_start {
parser.is_token_start = true;
}
if parser.is_escaped {
parser.is_escaped = false;
}
Some(b' ' | b'\t') => {
parser.is_token_start = true;
parser.is_escaped = false;

if parser.state == AddressState::Quote {
if parser.token_start == 0 {
parser.token_start = self.offset();
Expand All @@ -298,30 +295,30 @@ impl<'x> MessageStream<'x> {
}
continue;
}
b'\r' => continue,
b'(' if parser.state != AddressState::Quote && !parser.is_escaped => {
Some(b'\r') => continue,
Some(b'(') if parser.state != AddressState::Quote && !parser.is_escaped => {
parser.state_stack.push(parser.state);
if parser.state != AddressState::Comment {
parser.add_token(self, false);
parser.state = AddressState::Comment;
continue;
}
}
b')' if parser.state == AddressState::Comment && !parser.is_escaped => {
Some(b')') if parser.state == AddressState::Comment && !parser.is_escaped => {
let new_state = parser.state_stack.pop().unwrap();
if parser.state != new_state {
parser.add_token(self, false);
parser.state = new_state;
continue;
}
}
b':' if parser.state == AddressState::Name && !parser.is_escaped => {
Some(b':') if parser.state == AddressState::Name && !parser.is_escaped => {
parser.add_group();
parser.add_token(self, false);
parser.add_group_details();
continue;
}
b';' if parser.state == AddressState::Name => {
Some(b';') if parser.state == AddressState::Name => {
parser.add_token(self, false);
parser.add_address();
parser.add_group();
Expand All @@ -330,13 +327,8 @@ impl<'x> MessageStream<'x> {
_ => (),
}

if parser.is_escaped {
parser.is_escaped = false;
}

if parser.is_token_start {
parser.is_token_start = false;
}
parser.is_escaped = false;
parser.is_token_start = false;

if parser.token_start == 0 {
parser.token_start = self.offset();
Expand All @@ -360,12 +352,14 @@ impl<'x> MessageStream<'x> {
}

fn concat_tokens<'x>(tokens: &mut Vec<Cow<'x, str>>) -> Cow<'x, str> {
if tokens.len() == 1 {
tokens.pop().unwrap()
} else {
if 1 < tokens.len() {
let result = tokens.concat();
tokens.clear();
result.into()
} else if let Some(tok) = tokens.pop() {
tok
} else {
Cow::Borrowed("")
}
}

Expand Down Expand Up @@ -461,14 +455,14 @@ mod tests {
#[test]
fn parse_addresses() {
for test in load_tests("address.json") {
assert_eq!(
MessageStream::new(test.header.as_bytes())
.parse_address()
.unwrap_address(),
test.expected,
"failed for {:?}",
test.header
);
let with_trim = MessageStream::new(test.header.trim().as_bytes())
.parse_address()
.unwrap_address();
let without_trim = MessageStream::new(test.header.as_bytes())
.parse_address()
.unwrap_address();
assert_eq!(with_trim, without_trim);
assert_eq!(without_trim, test.expected, "failed for {:?}", test.header);
}
}
}