diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | string.c | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -6,6 +6,8 @@ Wed Dec 19 22:59:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_chomp_bang): check if match start at the head of a character. + * string.c (rb_str_chomp_bang): wrong adjust condition. + Wed Dec 19 21:42:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * re.c (rb_reg_regsub): should set checked encoding. @@ -4523,12 +4523,12 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str) if (is_broken_string(rs)) { return Qnil; } - pp = p + len - rslen; + e = p + len; + pp = e - rslen; if (p[len-1] == newline && (rslen <= 1 || memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) { - if (!isascii(*pp)) { - e = p+len; + if (rb_enc_mbmaxlen(enc) > 1) { while (p < pp) { p += rb_enc_mbclen(p, e, enc); } |