summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-17 14:04:48 +0000
committerjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-17 14:04:48 +0000
commit050daee04255790ab1a3bd5e1b0d1e8373e9aa20 (patch)
tree6f754b466dc67b7d0efa12cef27bfc2ff270b002 /lib
parent7fecc0048948d6ea348d387a8f0ada99b6572b32 (diff)
downloadruby-050daee04255790ab1a3bd5e1b0d1e8373e9aa20.tar.gz
ruby-050daee04255790ab1a3bd5e1b0d1e8373e9aa20.tar.xz
ruby-050daee04255790ab1a3bd5e1b0d1e8373e9aa20.zip
* lib/net/telnet.rb: Fixing Telnet#wairfor() which was broken by changes to
the Kernel::Integer() method. [ruby-core:17272] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/telnet.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index d2433554a..67fd656c6 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -564,8 +564,8 @@ module Net
@dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
if @options["Telnetmode"]
c = rest + c
- if Integer(c.rindex(/#{IAC}#{SE}/no)) <
- Integer(c.rindex(/#{IAC}#{SB}/no))
+ if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
+ Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||