1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Freeze Regexp literals

[Feature #8948] [Feature #16377]

Since Regexp literals always reference the same instance,
allowing to mutate them can lead to state leak.
This commit is contained in:
Jean Boussier 2019-11-27 11:40:18 +00:00 committed by Yusuke Endoh
parent 07aef4c99a
commit 98ef38ada4
Notes: git 2020-01-15 10:39:11 +09:00
8 changed files with 25 additions and 10 deletions

1
re.c
View file

@ -2967,6 +2967,7 @@ rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline)
return Qnil;
}
FL_SET(re, REG_LITERAL);
rb_obj_freeze(re);
return re;
}

View file

@ -235,13 +235,13 @@ describe "Marshal.dump" do
end
it "dumps a Regexp with instance variables" do
o = //
o = Regexp.new("")
o.instance_variable_set(:@ivar, :ivar)
Marshal.dump(o).should == "\x04\bI/\x00\x00\a:\x06EF:\n@ivar:\tivar"
end
it "dumps an extended Regexp" do
Marshal.dump(//.extend(Meths)).should == "\x04\bIe:\nMeths/\x00\x00\x06:\x06EF"
Marshal.dump(Regexp.new("").extend(Meths)).should == "\x04\bIe:\nMeths/\x00\x00\x06:\x06EF"
end
it "dumps a Regexp subclass" do

View file

@ -623,7 +623,7 @@ describe :marshal_load, shared: true do
describe "for a Regexp" do
it "loads an extended Regexp" do
obj = /[a-z]/.extend(Meths, MethsMore)
obj = /[a-z]/.dup.extend(Meths, MethsMore)
new_obj = Marshal.send(@method, "\004\be:\nMethse:\016MethsMore/\n[a-z]\000")
new_obj.should == obj

View file

@ -5,8 +5,16 @@ describe "Regexp#initialize" do
Regexp.should have_private_method(:initialize)
end
it "raises a SecurityError on a Regexp literal" do
-> { //.send(:initialize, "") }.should raise_error(SecurityError)
ruby_version_is ""..."2.7" do
it "raises a SecurityError on a Regexp literal" do
-> { //.send(:initialize, "") }.should raise_error(SecurityError)
end
end
ruby_version_is "2.7" do
it "raises a FrozenError on a Regexp literal" do
-> { //.send(:initialize, "") }.should raise_error(FrozenError)
end
end
it "raises a TypeError on an initialized non-literal Regexp" do

View file

@ -137,7 +137,7 @@ describe "String#match" do
end
it "calls match on the regular expression" do
regexp = /./
regexp = /./.dup
regexp.should_receive(:match).and_return(:foo)
'hello'.match(regexp).should == :foo
end

View file

@ -18,6 +18,12 @@ describe "Literal Regexps" do
/Hello/.should be_kind_of(Regexp)
end
ruby_version_is "2.7" do
it "is frozen" do
/Hello/.frozen?.should == true
end
end
it "caches the Regexp object" do
rs = []
2.times do |i|

View file

@ -312,7 +312,7 @@ describe "C-API Encoding function" do
end
it "sets the encoding of a Regexp to that of the second argument" do
@s.rb_enc_copy(/regexp/, @obj).encoding.should == Encoding::US_ASCII
@s.rb_enc_copy(/regexp/.dup, @obj).encoding.should == Encoding::US_ASCII
end
end
@ -363,7 +363,7 @@ describe "C-API Encoding function" do
end
it "sets the encoding of a Regexp to the encoding" do
@s.rb_enc_associate(/regexp/, "BINARY").encoding.should == Encoding::BINARY
@s.rb_enc_associate(/regexp/.dup, "BINARY").encoding.should == Encoding::BINARY
end
it "sets the encoding of a String to a default when the encoding is NULL" do
@ -380,7 +380,7 @@ describe "C-API Encoding function" do
it "sets the encoding of a Regexp to the encoding" do
index = @s.rb_enc_find_index("UTF-8")
enc = @s.rb_enc_associate_index(/regexp/, index).encoding
enc = @s.rb_enc_associate_index(/regexp/.dup, index).encoding
enc.should == Encoding::UTF_8
end

View file

@ -622,7 +622,7 @@ class TestRegexp < Test::Unit::TestCase
def test_dup
assert_equal(//, //.dup)
assert_raise(TypeError) { //.instance_eval { initialize_copy(nil) } }
assert_raise(TypeError) { //.dup.instance_eval { initialize_copy(nil) } }
end
def test_regsub