summaryrefslogtreecommitdiff
path: root/lib/net/imap.rb
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-06 01:13:45 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-06 01:13:45 +0000
commita0b80a44101708b5d66cdd87f16c98277954a77c ()
treee0332b2e8894775dc8059761b20dc426eda71ecf /lib/net/imap.rb
parentf9e3213f01e3c1d7b49229c8c4dcfe71c21e5ebb (diff)
* lib/net/imap.rb: Fix undefined variable usage & refactor/DRY
code. by @aledovsky. [Fixes GH-770] * test/net/test_imap.rb: related test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/net/imap.rb45
1 files changed, 37 insertions, 8 deletions
@@ -1256,9 +1256,7 @@ module Net
when nil
when String
when Integer
- if data < 0 || data >= 4294967296
- raise DataFormatError, num.to_s
- end
when Array
data.each do |i|
validate_data(i)
@@ -1572,7 +1570,7 @@ module Net
case data
when "*"
when Integer
- ensure_nz_number(data)
when Range
when Array
data.each do |i|
@@ -1586,11 +1584,42 @@ module Net
raise DataFormatError, data.inspect
end
end
- def ensure_nz_number(num)
- if num < -1 || num == 0 || num >= 4294967296
- msg = "nz_number must be non-zero unsigned 32-bit integer: " +
- num.inspect
raise DataFormatError, msg
end
end