From ea1b9d58b995f9ced8a4e92c7e5b459569ec921f Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 17 Dec 2007 09:08:27 +0000 Subject: * string.c (rb_str_index): check if substring is broken. * string.c (rb_str_rindex): ditto. * string.c (rb_str_succ): should carry over. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index 8cc6954c02..76a0049530 100644 --- a/string.c +++ b/string.c @@ -94,6 +94,7 @@ VALUE rb_cSymbol; #define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) #define IS_7BIT(str) (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) +#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) VALUE rb_fs; @@ -1443,6 +1444,9 @@ rb_str_index(VALUE str, VALUE sub, long offset) rb_encoding *enc; enc = rb_enc_check(str, sub); + if (is_broken_string(sub)) { + return -1; + } len = str_strlen(str, enc); slen = str_strlen(sub, enc); if (offset < 0) { @@ -1553,6 +1557,9 @@ rb_str_rindex(VALUE str, VALUE sub, long pos) int asc = IS_7BIT(str); enc = rb_enc_check(str, sub); + if (is_broken_string(sub)) { + return -1; + } len = str_strlen(str, enc); slen = str_strlen(sub, enc); /* substring longer than string */ @@ -1863,7 +1870,7 @@ rb_str_succ(VALUE orig) if (c == -1) { /* str contains no alnum */ c = '\001'; s = e; - while ((s = rb_enc_prev_char(sbeg, e, enc)) != 0) { + while ((s = rb_enc_prev_char(sbeg, s, enc)) != 0) { if (cc == 0) cc = rb_enc_codepoint(s, e, enc); cc += 1; l = rb_enc_mbcput(cc, carry, enc); -- cgit v1.2.3