diff options
Diffstat (limited to 'ext/-test-/string/cstr.c')
| -rw-r--r-- | ext/-test-/string/cstr.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c index 7759cbdcf0..ba2e46bc55 100644 --- a/ext/-test-/string/cstr.c +++ b/ext/-test-/string/cstr.c @@ -28,8 +28,24 @@ bug_str_cstr_term_char(VALUE str) rb_encoding *enc = rb_enc_get(str); RSTRING_GETMEM(str, s, len); - c = rb_enc_codepoint(&s[len], &s[len+rb_enc_mbminlen(enc)], enc); - return c ? rb_enc_uint_chr((unsigned int)c, enc) : Qnil; + s += len; + len = rb_enc_mbminlen(enc); + c = rb_enc_precise_mbclen(s, s + len, enc); + if (!MBCLEN_CHARFOUND_P(c)) { + c = (unsigned char)*s; + } + else { + c = rb_enc_mbc_to_codepoint(s, s + len, enc); + if (!c) return Qnil; + } + return rb_enc_uint_chr((unsigned int)c, enc); +} + +static VALUE +bug_str_s_cstr_term_char(VALUE self, VALUE str) +{ + Check_Type(str, T_STRING); + return bug_str_cstr_term_char(str); } void @@ -37,4 +53,5 @@ Init_cstr(VALUE klass) { rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0); rb_define_method(klass, "cstr_term_char", bug_str_cstr_term_char, 0); + rb_define_singleton_method(klass, "cstr_term_char", bug_str_s_cstr_term_char, 1); } |