]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2018 18:20:57 +0000 (14:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2018 18:20:57 +0000 (14:20 -0400)
1  2 
src/rust/protover/protoset.rs

index 3bfa7815f64024da5265641033efebd9b0a640c6,4f603a33cedc032a83a6c77ad0d681e257d9f7b2..aa8d243badaff51e02662e3c57378b8bbfa3e8e0
@@@ -366,20 -347,15 +370,15 @@@ impl FromStr for ProtoSet 
          let pieces: ::std::str::Split<char> = version_string.split(',');
  
          for p in pieces {
-             if p.is_empty() {
-                 continue;
-             } else if p.contains('-') {
+             if p.contains('-') {
                  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 {
-                     return Err(ProtoverError::ExceedsMax);
-                 }
                  pairs.push((lo, hi));
              } else {
                  let v: u32 = p.parse().or(Err(ProtoverError::Unparseable))?;