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 d1820c1516.

Fixes #27164; bugfix on 0.3.3.1-alpha.
This commit is contained in:
cypherpunks 2018-08-07 00:45:33 +00:00
parent 936e2aa0de
commit cc93f175ed
2 changed files with 17 additions and 1 deletions

4
changes/bug27164 Normal file
View file

@ -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.

View file

@ -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)?;
@ -538,6 +538,18 @@ mod test {
assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("-1"));
}
#[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,!"));