From 121d15dddab92307984c55165e2fc0ae01f5ff50 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 27 Oct 2009 07:36:54 +0000 Subject: * string.c (chopped_length): get rid of unexpected exception. see [ruby-core:26336]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index c64d7e40a5..9999c8570a 100644 --- a/string.c +++ b/string.c @@ -5925,9 +5925,9 @@ chopped_length(VALUE str) if (beg > end) return 0; p = rb_enc_prev_char(beg, end, end, enc); if (!p) return 0; - if (p > beg && rb_enc_codepoint(p, end, enc) == '\n') { + if (p > beg && rb_enc_ascget(p, end, 0, enc) == '\n') { p2 = rb_enc_prev_char(beg, p, end, enc); - if (p2 && rb_enc_codepoint(p2, end, enc) == '\r') p = p2; + if (p2 && rb_enc_ascget(p2, end, 0, enc) == '\r') p = p2; } return p - beg; } -- cgit v1.2.3