]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.4'
authorNick Mathewson <nickm@torproject.org>
Fri, 17 Aug 2018 13:29:46 +0000 (09:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 17 Aug 2018 13:29:46 +0000 (09:29 -0400)
1  2 
src/rust/protover/protoset.rs

index 5cea03983aea8f34af1f333fc2b63d1666fc7973,61b21ede98f71d919bb7c0a39755c4ce8d71cbbc..a670f796bfe86f54da334eb2405e9976fc7fabbd
@@@ -349,12 -348,12 +349,12 @@@ 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 low = pair.next().ok_or(ProtoverError::Unparseable)?;
                  let high = pair.next().ok_or(ProtoverError::Unparseable)?;
  
 -                let lo: Version =  low.parse().or(Err(ProtoverError::Unparseable))?;
 +                let lo: Version = low.parse().or(Err(ProtoverError::Unparseable))?;
                  let hi: Version = high.parse().or(Err(ProtoverError::Unparseable))?;
  
                  if lo == u32::MAX || hi == u32::MAX {