diff options
| author | yui-knk <[email protected]> | 2024-04-30 09:08:36 +0900 |
|---|---|---|
| committer | Yuichiro Kaneko <[email protected]> | 2024-05-02 10:14:54 +0900 |
| commit | 5108bed5130be00fd4df45eb12cc8ceee4533cf0 (patch) | |
| tree | 93c247605ecfbef85d45db3c4510be8539bbd2e0 | |
| parent | f109a83ddfcf68edb303b1e2f5bffa0986fb1436 (diff) | |
Revert "Fix memory leak of rb_ast_t in parser"
This reverts commit e3bfd25bd2202a172d7709e9a2f7b65b523a132d.
> "Allocate then wrap" is bad, because the "wrapping" itself can fail.
See: https://github.com/ruby/ruby/pull/10618#pullrequestreview-2019294349
| -rw-r--r-- | ruby_parser.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/ruby_parser.c b/ruby_parser.c index 4ba0a626c5..17b98a37d7 100644 --- a/ruby_parser.c +++ b/ruby_parser.c @@ -782,9 +782,10 @@ static const rb_data_type_t ast_data_type = { }; static VALUE -ast_alloc(rb_ast_t *ast) +ast_alloc(void) { - VALUE vast = TypedData_Wrap_Struct(0, &ast_data_type, ast); + rb_ast_t *ast; + VALUE vast = TypedData_Make_Struct(0, rb_ast_t, &ast_data_type, ast); #ifdef UNIVERSAL_PARSER ast = (rb_ast_t *)DATA_PTR(vast); ast->config = &rb_global_parser_config; @@ -796,9 +797,10 @@ VALUE rb_parser_compile_file_path(VALUE vparser, VALUE fname, VALUE file, int start) { struct ruby_parser *parser; - TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + VALUE vast = ast_alloc(); - VALUE vast = ast_alloc(parser_compile_file_path(parser, fname, file, start)); + TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + DATA_PTR(vast) = parser_compile_file_path(parser, fname, file, start); RB_GC_GUARD(vparser); return vast; @@ -808,9 +810,10 @@ VALUE rb_parser_compile_array(VALUE vparser, VALUE fname, VALUE array, int start) { struct ruby_parser *parser; - TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + VALUE vast = ast_alloc(); - VALUE vast = ast_alloc(parser_compile_array(parser, fname, array, start)); + TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + DATA_PTR(vast) = parser_compile_array(parser, fname, array, start); RB_GC_GUARD(vparser); return vast; @@ -820,9 +823,10 @@ VALUE rb_parser_compile_generic(VALUE vparser, rb_parser_lex_gets_func *lex_gets, VALUE fname, VALUE input, int start) { struct ruby_parser *parser; - TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + VALUE vast = ast_alloc(); - VALUE vast = ast_alloc(parser_compile_generic(parser, lex_gets, fname, input, start)); + TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + DATA_PTR(vast) = parser_compile_generic(parser, lex_gets, fname, input, start); RB_GC_GUARD(vparser); return vast; @@ -832,9 +836,10 @@ VALUE rb_parser_compile_string(VALUE vparser, const char *f, VALUE s, int line) { struct ruby_parser *parser; - TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + VALUE vast = ast_alloc(); - VALUE vast = ast_alloc(parser_compile_string(parser, f, s, line)); + TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + DATA_PTR(vast) = parser_compile_string(parser, f, s, line); RB_GC_GUARD(vparser); return vast; @@ -844,9 +849,10 @@ VALUE rb_parser_compile_string_path(VALUE vparser, VALUE f, VALUE s, int line) { struct ruby_parser *parser; - TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + VALUE vast = ast_alloc(); - VALUE vast = ast_alloc(parser_compile_string_path(parser, f, s, line)); + TypedData_Get_Struct(vparser, struct ruby_parser, &ruby_parser_data_type, parser); + DATA_PTR(vast) = parser_compile_string_path(parser, f, s, line); RB_GC_GUARD(vparser); return vast; @@ -1136,8 +1142,8 @@ parser_aset_script_lines_for(VALUE path, rb_parser_ary_t *lines) VALUE rb_ruby_ast_new(const NODE *const root) { - rb_ast_t *ast = ruby_xcalloc(1, sizeof(rb_ast_t)); - VALUE vast = ast_alloc(ast); + VALUE vast = ast_alloc(); + rb_ast_t *ast = DATA_PTR(vast); ast->body = (rb_ast_body_t){ .root = root, .frozen_string_literal = -1, |