commit cc93f175ed6f7495b4d50cdaad0527f718da77f5 Author: cypherpunks <cypherpunks@torproject.org> Date: Tue Aug 7 00:45:33 2018 +0000 rust/protover: fix hyphen parsing bug in ProtoSet::from_str() It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen and everything after. Introduced in d1820c1516a31a149fc51a9e5126bf899e4c4e08. Fixes #27164; bugfix on 0.3.3.1-alpha. --- changes/bug27164 | 4 ++++ src/rust/protover/protoset.rs | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/bug27164 b/changes/bug27164 new file mode 100644 index 000000000..d04d2f28f --- /dev/null +++ b/changes/bug27164 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - Protover parsing was ignoring a 2nd hyphen and everything after it, + accepting entries like "Link=1-5-foo". Fixes bug 27164; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/protoset.rs b/src/rust/protover/protoset.rs index 4afc50edf..61b21ede9 100644 --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@ -348,7 +348,7 @@ impl FromStr for ProtoSet { if p.is_empty() { continue; } else if p.contains('-') { - let mut pair = p.split('-'); + let mut pair = p.splitn(2, '-'); let low = pair.next().ok_or(ProtoverError::Unparseable)?; let high = pair.next().ok_or(ProtoverError::Unparseable)?; @@ -539,6 +539,18 @@ mod test { } #[test] + fn test_versions_from_str_hyphens() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("--1")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("-1-2")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1--2")); + } + + #[test] + fn test_versions_from_str_triple() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1-2-3")); + } + + #[test] fn test_versions_from_str_1exclam() { assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,!")); }