archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 49402,49403,49414:

Browse source 
cstr.c: get rid of exception

	* ext/-test-/string/cstr.c (bug_str_cstr_term_char): get rid of
  invalid byte sequence exception.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-02-19 08:32:27 +00:00
parent 3b888aeded
commit 964a1b683a
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/-test-/string/cstr.c
View file

@ -28,8 +28,24 @@ bug_str_cstr_term_char(VALUE str)
rb_encoding *enc = rb_enc_get(str); rb_encoding *enc = rb_enc_get(str);
RSTRING_GETMEM(str, s, len); RSTRING_GETMEM(str, s, len);
c = rb_enc_codepoint(&s[len], &s[len+rb_enc_mbminlen(enc)], enc); s += len;
return c ? rb_enc_uint_chr((unsigned int)c, enc) : Qnil; 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 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", bug_str_cstr_term, 0);
rb_define_method(klass, "cstr_term_char", bug_str_cstr_term_char, 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);
} }

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-02-19" #define RUBY_RELEASE_DATE "2015-02-19"
#define RUBY_PATCHLEVEL 60 #define RUBY_PATCHLEVEL 61
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2