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

[Bug #20033] Dynamic regexp should not assign captures

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-12-02 02:29:36 +09:00
parent ec83bd7356
commit a607d62d8c
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compile.c
View File

@ -4213,11 +4213,28 @@ compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
} }
static int static int
compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node) compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
{ {
int cnt; int cnt;
if (!RNODE_DREGX(node)->nd_next) {
VALUE match = RNODE_DREGX(node)->nd_lit;
if (RB_TYPE_P(match, T_REGEXP)) {
if (!popped) {
ADD_INSN1(ret, node, putobject, match);
RB_OBJ_WRITTEN(iseq, Qundef, match);
}
return COMPILE_OK;
}
}
CHECK(compile_dstr_fragments(iseq, ret, node, &cnt)); CHECK(compile_dstr_fragments(iseq, ret, node, &cnt));
ADD_INSN2(ret, node, toregexp, INT2FIX(RNODE_DREGX(node)->nd_cflag), INT2FIX(cnt)); ADD_INSN2(ret, node, toregexp, INT2FIX(RNODE_DREGX(node)->nd_cflag), INT2FIX(cnt));
if (popped) {
ADD_INSN(ret, node, pop);
}
return COMPILE_OK; return COMPILE_OK;
} }
@ -9901,14 +9918,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
case NODE_EVSTR: case NODE_EVSTR:
CHECK(compile_evstr(iseq, ret, RNODE_EVSTR(node)->nd_body, popped)); CHECK(compile_evstr(iseq, ret, RNODE_EVSTR(node)->nd_body, popped));
break; break;
case NODE_DREGX:{ case NODE_DREGX:
compile_dregx(iseq, ret, node); compile_dregx(iseq, ret, node, popped);
if (popped) {
ADD_INSN(ret, node, pop);
}
break; break;
}
case NODE_ONCE:{ case NODE_ONCE:{
int ic_index = body->ise_size++; int ic_index = body->ise_size++;
const rb_iseq_t *block_iseq; const rb_iseq_t *block_iseq;

4
parse.y
View File

@ -12905,8 +12905,8 @@ new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
} }
if (!RNODE_DREGX(node)->nd_next) { if (!RNODE_DREGX(node)->nd_next) {
VALUE src = RNODE_DREGX(node)->nd_lit; VALUE src = RNODE_DREGX(node)->nd_lit;
nd_set_type(node, NODE_LIT); VALUE re = reg_compile(p, src, options);
RB_OBJ_WRITTEN(p->ast, Qnil, RNODE_LIT(node)->nd_lit = reg_compile(p, src, options)); RB_OBJ_WRITTEN(p->ast, Qnil, RNODE_DREGX(node)->nd_lit = re);
} }
if (options & RE_OPTION_ONCE) { if (options & RE_OPTION_ONCE) {
node = NEW_ONCE(node, loc); node = NEW_ONCE(node, loc);

1
test/ruby/test_parse.rb
View File

@ -1071,6 +1071,7 @@ x = __ENCODING__
'(%w();/(?<a>.*)/)', '(%w();/(?<a>.*)/)',
'(1; (2; 3; (4; /(?<a>.*)/)))', '(1; (2; 3; (4; /(?<a>.*)/)))',
'(1+1; /(?<a>.*)/)', '(1+1; /(?<a>.*)/)',
'/#{""}(?<a>.*)/',
) do |code, pass| ) do |code, pass|
token = Random.bytes(4).unpack1("H*") token = Random.bytes(4).unpack1("H*")
if pass if pass