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

encoding.c (enc_set_index): raise instead of rb_bug() for non-encoding capable objects

Browse source 
* Add spec.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2018-08-03 13:52:13 +00:00
parent a354992688
commit 080d700e1d
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
encoding.c
View file

@ -819,7 +819,9 @@ rb_enc_get_index(VALUE obj)
static void static void
enc_set_index(VALUE obj, int idx) enc_set_index(VALUE obj, int idx)
{ {
if (!enc_capable(obj)) rb_bug("enc_set_index: not capable object"); if (!enc_capable(obj)) {
rb_raise(rb_eArgError, "cannot set encoding on non-encoding capable object");
}
if (idx < ENCODING_INLINE_MAX) { if (idx < ENCODING_INLINE_MAX) {
ENCODING_SET_INLINED(obj, idx); ENCODING_SET_INLINED(obj, idx);

9
spec/ruby/optional/capi/encoding_spec.rb
View file

@ -30,6 +30,15 @@ describe :rb_enc_set_index, shared: true do
result = @s.send(@method, str, 1) result = @s.send(@method, str, 1)
result.first.should == result.last result.first.should == result.last
end end
ruby_version_is "2.6" do
it "raises an ArgumentError for a non-encoding capable object" do
obj = Object.new
-> {
result = @s.send(@method, obj, 1)
}.should raise_error(ArgumentError, "cannot set encoding on non-encoding capable object")
end
end
end end
describe "C-API Encoding function" do describe "C-API Encoding function" do