diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-17 16:20:53 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-17 16:20:53 +0000 |
commit | 34783456e8105c65377a4473b466ffeaa581d87e (patch) | |
tree | 96b0a7cabfff42bae91efa5e6fe578d941397dc8 /lib/net | |
parent | 428db8240313f3af7ca3eb4359110563d108fbd3 (diff) |
merge revision(s) 63396: [Backport #14750]
net/imap: Fix ArgumentError in send_string_data
Thanks to ShockwaveNN (Pavel Lobashov) for reporting the bug.
[ruby-core:86990] [Bug #14750]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r-- | lib/net/imap.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 3d33b94fdd..7db9c7a27e 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -1323,11 +1323,11 @@ module Net when nil put_string("NIL") when String - send_string_data(data) + send_string_data(data, tag) when Integer send_number_data(data) when Array - send_list_data(data) + send_list_data(data, tag) when Time send_time_data(data) when Symbol @@ -1337,13 +1337,13 @@ module Net end end - def send_string_data(str) + def send_string_data(str, tag = nil) case str when "" put_string('""') when /[\x80-\xff\r\n]/n # literal - send_literal(str) + send_literal(str, tag) when /[(){ \x00-\x1f\x7f%*"\\]/n # quoted string send_quoted_string(str) @@ -1356,7 +1356,7 @@ module Net put_string('"' + str.gsub(/["\\]/n, "\\\\\\&") + '"') end - def send_literal(str, tag) + def send_literal(str, tag = nil) synchronize do put_string("{" + str.bytesize.to_s + "}" + CRLF) @continued_command_tag = tag @@ -1377,7 +1377,7 @@ module Net put_string(num.to_s) end - def send_list_data(list) + def send_list_data(list, tag = nil) put_string("(") first = true list.each do |i| @@ -1386,7 +1386,7 @@ module Net else put_string(" ") end - send_data(i) + send_data(i, tag) end put_string(")") end |