diff options
| author | Kevin Newton <[email protected]> | 2024-02-09 15:54:00 -0500 |
|---|---|---|
| committer | Kevin Newton <[email protected]> | 2024-02-09 16:30:07 -0500 |
| commit | e96c838ca40be75b57af289a182bb0ed6adaf829 (patch) | |
| tree | 2f8a658828dd1fefbe1f002047db34a5d0d5b824 | |
| parent | 86882565221cb709f4213e7c7699ba73f16f1107 (diff) | |
[PRISM] Fix flaky memory in scope nodes
| -rw-r--r-- | prism_compile.c | 13 | ||||
| -rw-r--r-- | test/.excludes-prism/TestSetTraceFunc.rb | 3 |
2 files changed, 5 insertions, 11 deletions
diff --git a/prism_compile.c b/prism_compile.c index b2e5c38587..3bdd22ed3a 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -2439,6 +2439,10 @@ pm_compile_pattern(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t void pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_t *previous, const pm_parser_t *parser) { + // This is very important, otherwise the scope node could be seen as having + // certain flags set that _should not_ be set. + memset(scope, 0, sizeof(pm_scope_node_t)); + scope->base.type = PM_SCOPE_NODE; scope->base.location.start = node->location.start; scope->base.location.end = node->location.end; @@ -2446,17 +2450,10 @@ pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_ scope->previous = previous; scope->parser = parser; scope->ast_node = (pm_node_t *)node; - scope->parameters = NULL; - scope->body = NULL; - scope->constants = NULL; - scope->local_table_for_iseq_size = 0; if (previous) { scope->constants = previous->constants; } - scope->index_lookup_table = NULL; - - pm_constant_id_list_init(&scope->locals); switch (PM_NODE_TYPE(node)) { case PM_BLOCK_NODE: { @@ -2541,7 +2538,7 @@ pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_ default: assert(false && "unreachable"); break; - } + } } void diff --git a/test/.excludes-prism/TestSetTraceFunc.rb b/test/.excludes-prism/TestSetTraceFunc.rb deleted file mode 100644 index 3999fd3884..0000000000 --- a/test/.excludes-prism/TestSetTraceFunc.rb +++ /dev/null @@ -1,3 +0,0 @@ -exclude(:test_tracepoint_nested_enabled_with_target, "unknown") -exclude(:test_allow_reentry, "unknown") -exclude(:test_tp_rescue, "unknown") |