summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-21 05:05:01 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-21 05:05:01 +0000
commit13db60aad38c6c258c4831fcc13ff000cd0c4f61 (patch)
tree0db7129525e32bc6e78bdd46511cf90c65d038c4
parente056e74e648de39ffa4a318db2b4870007d3cc36 (diff)
* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-lis:40546]
(backported from CVS HEAD) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/imap.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 97e165bff5..928c834ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 21 13:58:37 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-lis:40546]
+ (backported from CVS HEAD)
+
Fri Jan 21 09:30:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 7886c66fdd..640f2bd566 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1266,7 +1266,7 @@ module Net
buf.concat(c)
i += 1
elsif (c & 0xe0) == 0xc0 &&
- inlen >= 2 &&
+ len >= 2 &&
(s[i + 1] & 0xc0) == 0x80
if c == 0xc0 || c == 0xc1
raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)