From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Oct 2018 18:20:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'onionk/rust-protocommas1'
X-Git-Tag: tor-0.4.0.1-alpha~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a05a113062459faf7c02a7f661542b14ea5ade20;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'onionk/rust-protocommas1'
---

a05a113062459faf7c02a7f661542b14ea5ade20
diff --cc src/rust/protover/protoset.rs
index 3bfa7815f6,4f603a33ce..aa8d243bad
--- a/src/rust/protover/protoset.rs
+++ b/src/rust/protover/protoset.rs
@@@ -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))?;