Skip to content

[pull] master from ruby:master #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 30, 2026
Merged

[pull] master from ruby:master #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6804add
Keep the fallback string alive across rb_econv_insert_output
ko1 Aug 30, 2026
aa33db6
Pass the buffer's size to ruby_xrealloc_sized, not the field distance
ko1 Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions test/ruby/test_transcode.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2232,6 +2232,16 @@ def test_fallback_proc
assert_equal("U+3042", "\u{3042}".encode("US-ASCII", fallback: fallback))
end

def test_fallback_grow_insert_buffer
# A later fallback insertion larger than the first one's buffer grows it
# in rb_econv_insert_output; the sized realloc there passed a wrong old
# size (caught by RUBY_DEBUG builds).
n = 0
r = "\u{3042}\u{3044}\u{3046}".encode("US-ASCII",
fallback: proc {|x| n += 1; "Y" * (5000 * n)})
assert_equal(30000, r.bytesize)
end

def test_fallback_method
def (fallback = "U+%.4X").escape(x)
self % x.unpack("U")
Expand Down
3 changes: 2 additions & 1 deletion transcode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,7 +1712,7 @@ rb_econv_insert_output(rb_econv_t *ec,
size_t s = (*data_end_p - *buf_start_p) + need;
if (s < need)
goto fail;
buf = ruby_xrealloc_sized(*buf_start_p, s, buf_end_p - buf_start_p);
buf = ruby_xrealloc_sized(*buf_start_p, s, *buf_end_p - *buf_start_p);
*data_start_p = buf;
*data_end_p = buf + (*data_end_p - *buf_start_p);
*buf_start_p = buf;
Expand Down Expand Up @@ -2439,6 +2439,7 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
if (!UNDEF_P(rep) && !NIL_P(rep)) {
ret = rb_econv_insert_output(ec, (const unsigned char *)RSTRING_PTR(rep),
RSTRING_LEN(rep), rb_enc_name(rb_enc_get(rep)));
RB_GC_GUARD(rep); // insert_output may GC while reading rep's bytes
if ((int)ret == -1) {
rb_econv_close(ec);
rb_raise(rb_eArgError, "too big fallback string");
Expand Down