kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 54210: [Backport #12204]

Browse source 
* string.c (enc_succ_alnum_char): try to skip an invalid character
	  gap between GREEK CAPITAL RHO and SIGMA.
	  [ruby-core:74478] [Bug #12204]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 08:00:06 +00:00
parent ba57632186
commit 9d502cf9a4
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 29 16:54:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (enc_succ_alnum_char): try to skip an invalid character
gap between GREEK CAPITAL RHO and SIGMA.
[ruby-core:74478] [Bug #12204]
Tue Mar 29 16:45:58 2016 Victor Nawothnig <Victor.Nawothnig@gmail.com> Tue Mar 29 16:45:58 2016 Victor Nawothnig <Victor.Nawothnig@gmail.com>
* parse.y (parse_numvar): NTH_REF must be less than a half of * parse.y (parse_numvar): NTH_REF must be less than a half of

16
string.c
View file

@ -3475,6 +3475,10 @@ enc_succ_alnum_char(char *p, long len, rb_encoding *enc, char *carry)
int range; int range;
char save[ONIGENC_CODE_TO_MBC_MAXLEN]; char save[ONIGENC_CODE_TO_MBC_MAXLEN];
/* skip 03A2, invalid char between GREEK CAPITAL LETTERS */
int try;
const int max_gaps = 1;
c = rb_enc_mbc_to_codepoint(p, p+len, enc); c = rb_enc_mbc_to_codepoint(p, p+len, enc);
if (rb_enc_isctype(c, ONIGENC_CTYPE_DIGIT, enc)) if (rb_enc_isctype(c, ONIGENC_CTYPE_DIGIT, enc))
ctype = ONIGENC_CTYPE_DIGIT; ctype = ONIGENC_CTYPE_DIGIT;
@ -3484,11 +3488,13 @@ enc_succ_alnum_char(char *p, long len, rb_encoding *enc, char *carry)
return NEIGHBOR_NOT_CHAR; return NEIGHBOR_NOT_CHAR;
MEMCPY(save, p, char, len); MEMCPY(save, p, char, len);
ret = enc_succ_char(p, len, enc); for (try = 0; try <= max_gaps; ++try) {
if (ret == NEIGHBOR_FOUND) { ret = enc_succ_char(p, len, enc);
c = rb_enc_mbc_to_codepoint(p, p+len, enc); if (ret == NEIGHBOR_FOUND) {
if (rb_enc_isctype(c, ctype, enc)) c = rb_enc_mbc_to_codepoint(p, p+len, enc);
return NEIGHBOR_FOUND; if (rb_enc_isctype(c, ctype, enc))
return NEIGHBOR_FOUND;
}
} }
MEMCPY(p, save, char, len); MEMCPY(p, save, char, len);
range = 1; range = 1;

5
test/ruby/test_m17n.rb
View file

@ -1682,4 +1682,9 @@ class TestM17N < Test::Unit::TestCase
end end
assert_equal(e("[\"\xB4\xC1\xBB\xFA\"]"), s, bug11787) assert_equal(e("[\"\xB4\xC1\xBB\xFA\"]"), s, bug11787)
end end
def test_greek_capital_gap
bug12204 = '[ruby-core:74478] [Bug #12204] GREEK CAPITAL RHO and SIGMA'
assert_equal("\u03A3", "\u03A1".succ, bug12204)
end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0" #define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-29" #define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 40 #define RUBY_PATCHLEVEL 41
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3