diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-01 01:02:30 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-01 01:02:30 +0000 |
| commit | d5fec27d8e1fe31c38b199c1803db9dbdfaa7da7 (patch) | |
| tree | 9aa728e4eb2030496dce2c79bd208c23ae007f48 /string.c | |
| parent | 18e70b266f05faa7963c159842202e5c1ad4cc15 (diff) | |
* string.c (rb_str_coderange_scan_restartable): should not return
offset in the middle of a character.
* string.c (rb_str_coderange_scan_restartable): should not return
invalid cr value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -224,8 +224,8 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc while (p < e) { int ret = rb_enc_precise_mbclen(p, e, enc); if (!MBCLEN_CHARFOUND_P(ret)) { - *cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ret; - return e - s; + *cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_UNKNOWN; + return p - s; } p += MBCLEN_CHARFOUND_LEN(ret); if (p < e) { @@ -243,7 +243,7 @@ rb_str_coderange_scan_restartable(const char *s, const char *e, rb_encoding *enc while (p < e) { int ret = rb_enc_precise_mbclen(p, e, enc); if (!MBCLEN_CHARFOUND_P(ret)) { - *cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ret; + *cr = MBCLEN_INVALID_P(ret) ? ENC_CODERANGE_BROKEN: ENC_CODERANGE_UNKNOWN; return p - s; } p += MBCLEN_CHARFOUND_LEN(ret); |