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

* string.c (rb_str_succ): should not enter infinite loop for

Browse source 
non-ASCII, non-alphanumeric character at the bottom.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-13 09:20:13 +00:00
parent 66bae8ad6d
commit 7987f38467
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -13,6 +13,9 @@ Thu Dec 13 17:51:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): ditto.
* string.c (rb_str_succ): should not enter infinite loop for
non-ASCII, non-alphanumeric character at the bottom.
Thu Dec 13 17:03:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_compatible): should swap encoding indexes too.

4
bootstraptest/test_knownbug.rb
View file

@ -127,9 +127,9 @@ assert_equal 'false', %q{
s.include?("\xb0\xa3".force_encoding("euc-jp"))
}
assert_equal 'nil', %q{
assert_equal 'ok', %q{
s = "\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4".force_encoding("euc-jp")
s.index("\xb3\xa3".force_encoding("euc-jp"))
s.index("\xb3\xa3".force_encoding("euc-jp")) or :ok
}
assert_equal 'ok', %q{

9
string.c
View file

@ -1811,6 +1811,7 @@ rb_str_succ(VALUE orig)
VALUE str;
char *sbeg, *s, *e;
int c = -1;
unsigned int cc = 0;
long n = 0, o = 0, l;
char carry[ONIGENC_CODE_TO_MBC_MAXLEN];
@ -1824,7 +1825,7 @@ rb_str_succ(VALUE orig)
s = e = sbeg + RSTRING_LEN(str);
while ((s = rb_enc_prev_char(sbeg, s, enc)) != 0) {
unsigned int cc = rb_enc_codepoint(s, e, enc);
cc = rb_enc_codepoint(s, e, enc);
if (rb_enc_isalnum(cc, enc)) {
if (isascii(cc)) {
if ((c = succ_char(s)) == 0) break;
@ -1834,12 +1835,16 @@ rb_str_succ(VALUE orig)
}
n = s - sbeg;
}
else {
break;
}
}
if (c == -1) { /* str contains no alnum */
c = '\001';
s = e;
while ((s = rb_enc_prev_char(sbeg, e, enc)) != 0) {
unsigned int cc = rb_enc_codepoint(s, e, enc) + 1;
if (cc == 0) cc = rb_enc_codepoint(s, e, enc);
cc += 1;
l = rb_enc_mbcput(cc, carry, enc);
if (l > 0) {
if (l == (o = e - s)) goto overlay;