1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not intern invalid symbols in eval parse

Browse Source 
When the inner code cannot represent the name of the locals in the
outer code, do not bother putting them into the constant pool as
they will not be referenced.

Fixes [Bug #20992]

Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
This commit is contained in:
Kevin Newton 2025-01-05 21:42:23 -05:00
parent 27c9ccb30e
commit 1a06bee027
Notes: git 2025-01-08 03:30:46 +00:00 
Merged: https://github.com/ruby/ruby/pull/12514
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/.excludes/TestVariable.rb
View File

@ -1,3 +0,0 @@
if RUBY_DESCRIPTION.include?("+PRISM")
exclude(:test_local_variables_encoding, "[Bug #20992]")
end

10
vm_eval.c
View File

@ -1690,6 +1690,8 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
// scopes array refer to root nodes on the tree, and higher indexes are the
// leaf nodes.
iseq = parent;
rb_encoding *encoding = rb_enc_get(src);
for (int scopes_index = 0; scopes_index < scopes_count; scopes_index++) {
VALUE iseq_value = (VALUE)iseq;
int locals_count = ISEQ_BODY(iseq)->local_table_size;
@ -1711,6 +1713,14 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
continue;
}
// Check here if this local can be represented validly in the
// encoding of the source string. If it _cannot_, then it should
// not be added to the constant pool as it would not be able to
// be referenced anyway.
if (rb_enc_str_coderange_scan(name_obj, encoding) == ENC_CODERANGE_BROKEN) {
continue;
}
/* We need to duplicate the string because the Ruby string may
* be embedded so compaction could move the string and the pointer
* will change. */