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

Preserve ec argument across longjmp

Browse Source 
Fix segfault on icc 2023.2.
An optimizer may allocate this argument to a register, and it may be
clobbered by `longjmp`, e.g. exceptions.
This commit is contained in:
Nobuyoshi Nakada 2023-07-28 17:50:25 +09:00
parent 6391132c03
commit 7cfabe1acc
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2023-07-28 11:42:04 +00:00 
Merged: https://github.com/ruby/ruby/pull/8135
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
load.c
View File

@ -1184,8 +1184,10 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
rb_thread_t *th = rb_ec_thread_ptr(ec);
volatile const struct {
VALUE wrapper, self, errinfo;
rb_execution_context_t *ec;
} saved = {
th->top_wrapper, th->top_self, ec->errinfo,
ec,
};
enum ruby_tag_type state;
char *volatile ftptr = 0;
@ -1248,6 +1250,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
}
EC_POP_TAG();
ec = saved.ec;
rb_thread_t *th2 = rb_ec_thread_ptr(ec);
th2->top_self = saved.self;
th2->top_wrapper = saved.wrapper;