tor

commit bedc0b0b8f66b73a1052dddfdd1fb0c798bff48a
parent 042aed3f1d3c0da10cce451f103735036407aa53
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 17 Aug 2018 09:29:46 -0400

Merge branch 'maint-0.3.4'

Diffstat:
A
changes/bug27164
 | 
4
++++
M
src/rust/protover/protoset.rs
 | 
14
+++++++++++++-

2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/changes/bug27164 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
@@ -349,7 +349,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)?;
@@ -540,6 +540,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,!"));
     }