archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 02a7e12b80: [Backport #19593]

Browse source 
Ensure throw data is not set as cause

	[Bug #19593]

	rb_ec_setup_exception did not check if errinfo is a throw_data. This can
	cause crashes in code since it is assumed that id_cause is an object.

	We saw a crash in show_cause due to id_cause of errinfo being a
	throw_data. It crashes on rb_obj_is_kind_of since it cannot be called on
	T_IMEMO objects.

	Unfortunately, we couldn't find a reproduction script, however we
	debugged the core dump and rb_ec_setup_exception is the only place where
	id_cause is assigned from errinfo without checking if it is a
	throw_data.

	```
	0x0000556c5708e6dd in sigsegv (sig=11, info=0x7f301befa3f0, ctx=0x7f301befa2c0) at signal.c:964
	0x00007f301d046420 in <signal handler called> () at /lib/x86_64-linux-gnu/libpthread.so.0
	class_search_class_ancestor (c=139844586301760, cl=<optimized out>) at object.c:810
	rb_obj_is_kind_of (obj=obj@entry=139839221734880, c=139844586301760) at object.c:861
	0x0000556c56f2f00f in show_cause
	    (errinfo=errinfo@entry=139838840645160, str=str@entry=139839221730520, opt=139839221730480, highlight=0, reverse=reverse@entry=0, backtrace_limit=backtrace_limit@entry=-1, shown_causes=0x7ffe9d1a2d68) at ./include/ruby/internal/special_consts.h:175
	```

	Co-Authored-By: Jean Boussier <byroot@ruby-lang.org>
	---
	 eval.c | 4 ++++
	 1 file changed, 4 insertions(+)
This commit is contained in:
U.Nakamura 2023-07-18 20:50:08 +09:00
parent c08ee61fa8
commit c96ef4eee6
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eval.c
View file

@ -638,6 +638,10 @@ rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
cause = get_ec_errinfo(ec);
}
if (cause != mesg) {
if (THROW_DATA_P(cause)) {
cause = Qnil;
}
rb_ivar_set(mesg, id_cause, cause);
}
}

6
version.h
View file

@ -11,11 +11,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 229
#define RUBY_PATCHLEVEL 230
#define RUBY_RELEASE_YEAR 2023
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 29
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 18
#include "ruby/version.h"