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) 01fd262e62: [Backport #20245] (#10307)

Browse source 
Fix crash when checking symbol encoding

	[Bug #20245]

	We sometimes pass in a fake string to sym_check_asciionly. This can crash
	if sym_check_asciionly raises because it creates a CFP with the fake
	string as the receiver which will crash if GC tries to mark the CFP.

	For example, the following script crashes:

	    GC.stress = true
	    Object.const_defined?("\xC3")
This commit is contained in:
NARUSE, Yui 2024-03-21 09:05:07 +09:00 • committed by GitHub
parent 00cb72157a
commit b2c2702f20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
symbol.c
View file

@ -581,11 +581,14 @@ register_static_symid_str(ID id, VALUE str)
}
static int
sym_check_asciionly(VALUE str)
sym_check_asciionly(VALUE str, bool fake_str)
{
if (!rb_enc_asciicompat(rb_enc_get(str))) return FALSE;
switch (rb_enc_str_coderange(str)) {
case ENC_CODERANGE_BROKEN:
if (fake_str) {
str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str));
}
rb_raise(rb_eEncodingError, "invalid symbol in encoding %s :%+"PRIsVALUE,
rb_enc_name(rb_enc_get(str)), str);
case ENC_CODERANGE_7BIT:
@ -778,7 +781,7 @@ intern_str(VALUE str, int mutable)
id = rb_str_symname_type(str, IDSET_ATTRSET_FOR_INTERN);
if (id == (ID)-1) id = ID_JUNK;
if (sym_check_asciionly(str)) {
if (sym_check_asciionly(str, false)) {
if (!mutable) str = rb_str_dup(str);
rb_enc_associate(str, rb_usascii_encoding());
}
@ -869,7 +872,7 @@ rb_str_intern(VALUE str)
else if (USE_SYMBOL_GC) {
rb_encoding *enc = rb_enc_get(str);
rb_encoding *ascii = rb_usascii_encoding();
if (enc != ascii && sym_check_asciionly(str)) {
if (enc != ascii && sym_check_asciionly(str, false)) {
str = rb_str_dup(str);
rb_enc_associate(str, ascii);
OBJ_FREEZE(str);
@ -1116,7 +1119,7 @@ rb_check_id(volatile VALUE *namep)
*namep = name;
}
sym_check_asciionly(name);
sym_check_asciionly(name, false);
return lookup_str_id(name);
}
@ -1175,7 +1178,7 @@ rb_check_symbol(volatile VALUE *namep)
*namep = name;
}
sym_check_asciionly(name);
sym_check_asciionly(name, false);
if ((sym = lookup_str_sym(name)) != 0) {
return sym;
@ -1190,7 +1193,7 @@ rb_check_id_cstr(const char *ptr, long len, rb_encoding *enc)
struct RString fake_str;
const VALUE name = rb_setup_fake_str(&fake_str, ptr, len, enc);
sym_check_asciionly(name);
sym_check_asciionly(name, true);
return lookup_str_id(name);
}
@ -1202,7 +1205,7 @@ rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
struct RString fake_str;
const VALUE name = rb_setup_fake_str(&fake_str, ptr, len, enc);
sym_check_asciionly(name);
sym_check_asciionly(name, true);
if ((sym = lookup_str_sym(name)) != 0) {
return sym;

8
test/ruby/test_module.rb
View file

@ -253,6 +253,14 @@ class TestModule < Test::Unit::TestCase
assert_operator(Math, :const_defined?, "PI")
assert_not_operator(Math, :const_defined?, :IP)
assert_not_operator(Math, :const_defined?, "IP")
# Test invalid symbol name
# [Bug #20245]
EnvUtil.under_gc_stress do
assert_raise(EncodingError) do
Math.const_defined?("\xC3")
end
end
end
def each_bad_constants(m, &b)

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 17
#define RUBY_PATCHLEVEL 18
#include "ruby/version.h"
#include "ruby/internal/abi.h"