diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | sprintf.c | 4 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Mon Feb 8 23:49:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org> + + * io.c (rb_io_getline_fast): wrong calculation of new position + from rb_str_coderange_scan_restartable(). [ruby-core:28103] + + * io.c (read_all): ditto. + + * sprintf.c (rb_str_format): ditto. + Mon Feb 8 21:03:53 2010 Tanaka Akira <akr@fsij.org> * ext/socket/socket.c (socket_s_ip_address_list): obtain the scope_id @@ -2287,7 +2287,7 @@ rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc) } len += pending; if (cr != ENC_CODERANGE_BROKEN) - pos = rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr); + pos += rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr); if (e) break; } rb_thread_wait_fd(fptr->fd); @@ -483,7 +483,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) for (t = p; t < end && *t != '%'; t++) ; PUSH(p, t - p); if (coderange != ENC_CODERANGE_BROKEN && scanned < blen) { - scanned = rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &coderange); + scanned += rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &coderange); ENC_CODERANGE_SET(result, coderange); } if (t >= end) { @@ -672,7 +672,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) rb_str_set_len(result, blen); if (coderange != ENC_CODERANGE_BROKEN && scanned < blen) { int cr = coderange; - scanned = rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &cr); + scanned += rb_str_coderange_scan_restartable(buf+scanned, buf+blen, enc, &cr); ENC_CODERANGE_SET(result, (cr == ENC_CODERANGE_UNKNOWN ? ENC_CODERANGE_BROKEN : (coderange = cr))); |