errno.c (mrb_sce_sys_fail): SystemCallError may be overridden; fix mruby#5793

matz · matz · commit db536da41283 · 2022-09-18T00:07:28.000+09:00
diff --git a/mrbgems/mruby-errno/src/errno.c b/mrbgems/mruby-errno/src/errno.c
@@ -66,7 +66,7 @@ mrb_errno_define_exxx(mrb_state *mrb, mrb_sym name, int eno)
     }
   }
 
-  struct RClass *sce_class = mrb_class_get_id(mrb, MRB_SYM(SystemCallError));
+  struct RClass *sce_class = mrb_exc_get_id(mrb, MRB_SYM(SystemCallError));
   struct RClass *e = mrb_define_class_under_id(mrb, errno_module, name, sce_class);
   mrb_define_const_id(mrb, e, MRB_SYM(Errno), mrb_fixnum_value(eno));
 
@@ -272,7 +272,7 @@ mrb_sce_sys_fail(mrb_state *mrb, mrb_value cls)
   mrb_int argc;
 
   mrb->c->ci->mid = 0;
-  sce = mrb_class_get_id(mrb, MRB_SYM(SystemCallError));
+  sce = mrb_class_ptr(cls);
   argc = mrb_get_args(mrb, "o|S", &no, &msg);
 
   struct RBasic* e = mrb_obj_alloc(mrb, MRB_TT_EXCEPTION, sce);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ mrb_errno_define_exxx(mrb_state *mrb, mrb_sym name, int eno)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- struct RClass *sce_class = mrb_class_get_id(mrb, MRB_SYM(SystemCallError));`
	`69`	`+ struct RClass *sce_class = mrb_exc_get_id(mrb, MRB_SYM(SystemCallError));`
`70`	`70`	`struct RClass *e = mrb_define_class_under_id(mrb, errno_module, name, sce_class);`
`71`	`71`	`mrb_define_const_id(mrb, e, MRB_SYM(Errno), mrb_fixnum_value(eno));`
`72`	`72`
`@@ -272,7 +272,7 @@ mrb_sce_sys_fail(mrb_state *mrb, mrb_value cls)`
`272`	`272`	`mrb_int argc;`
`273`	`273`
`274`	`274`	`mrb->c->ci->mid = 0;`
`275`		`- sce = mrb_class_get_id(mrb, MRB_SYM(SystemCallError));`
	`275`	`+ sce = mrb_class_ptr(cls);`
`276`	`276`	`argc = mrb_get_args(mrb, "o\|S", &no, &msg);`
`277`	`277`
`278`	`278`	`struct RBasic* e = mrb_obj_alloc(mrb, MRB_TT_EXCEPTION, sce);`