mirrors/ruby
0
0 Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-10-28 16:36:20 +08:00
Code Activity

Crash handler assumes box is present

Browse Source 
rb_current_box_in_crash_report() calls GET_EC(), which assumes ec is
present. The crash handler should work when called from non-Ruby
threads (no ec).
This commit is contained in:
Luke Gruber authored and Luke Gruber committed 2026-07-22 14:29:08 -04:00
1 parent c2b16c8dd5
commit 47c424b767
2 files changed
+12 -5
Notes: git 2026-07-22 18:29:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/17988
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

box.c
+3
View File
@@ -103,6 +103,7 @@ rb_main_box(void)
return main_box;
}
// NOTE: must be called by Ruby thread
const rb_box_t *
rb_current_box(void)
{
@@ -121,6 +122,7 @@ rb_current_box(void)
return rb_vm_current_box(GET_EC());
}
// NOTE: must be called by Ruby thread
const rb_box_t *
rb_loading_box(void)
{
@@ -132,6 +134,7 @@ rb_loading_box(void)
return rb_vm_loading_box(GET_EC());
}
// NOTE: must be called by Ruby thread
const rb_box_t *
rb_current_box_in_crash_report(void)
{
vm_dump.c
+9 -5
View File
@@ -1419,16 +1419,20 @@ rb_vm_bugreport(const void *ctx, FILE *errout)
enum {other_runtime_info = 0};
#endif
const rb_vm_t *const vm = GET_VM();
const rb_box_t *current_box = rb_current_box_in_crash_report();
const rb_execution_context_t *ec = rb_current_execution_context(false);
VALUE loaded_features;
rb_box_t *current_box = NULL;
VALUE loaded_features = 0;
if (ec) {
current_box = (rb_box_t*)rb_current_box_in_crash_report();
}
else {
current_box = (rb_box_t*)rb_main_box();
if (!current_box) current_box = (rb_box_t*)rb_root_box();
}
if (current_box) {
loaded_features = current_box->loaded_features;
}
else {
loaded_features = rb_root_box()->loaded_features;
}
if (vm && ec) {
rb_vmdebug_stack_dump_raw(ec, ec->cfp, errout);