mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save ns that may be clobbered by setjmp/longjmp

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2025-10-03 17:59:54 +09:00
parent c93b521fac
commit 5b2ec0eb1b
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
load.c
View File

@ -1289,14 +1289,15 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
{
volatile int result = -1;
rb_thread_t *th = rb_ec_thread_ptr(ec);
const rb_namespace_t *ns = rb_loading_namespace();
volatile const struct {
VALUE wrapper, self, errinfo;
rb_execution_context_t *ec;
const rb_namespace_t *ns;
} saved = {
th->top_wrapper, th->top_self, ec->errinfo,
ec,
ec, ns,
};
const rb_namespace_t *ns = rb_loading_namespace();
enum ruby_tag_type state;
char *volatile ftptr = 0;
VALUE path;
@ -1365,6 +1366,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
EC_POP_TAG();
ec = saved.ec;
ns = saved.ns;
rb_thread_t *th2 = rb_ec_thread_ptr(ec);
th2->top_self = saved.self;
th2->top_wrapper = saved.wrapper;