mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
4e2738f477
rb_enc_interned_str: handle autoloaded encodings If called with an autoloaded encoding that was not yet initialized, `rb_enc_interned_str` would crash with a NULL pointer exception. See: https://github.com/ruby/ruby/pull/4119#issuecomment-800189841 --- encoding.c | 28 ++++++++++++---------------- ext/-test-/string/depend | 3 +++ ext/-test-/string/fstring.c | 15 +++++++++++++++ internal/encoding.h | 3 +++ string.c | 4 ++++ test/-ext-/string/test_fstring.rb | 16 ++++++++++++++++ 6 files changed, 53 insertions(+), 16 deletions(-)
30 lines
686 B
C
30 lines
686 B
C
#include "ruby.h"
|
|
#include "ruby/encoding.h"
|
|
|
|
VALUE rb_fstring(VALUE str);
|
|
|
|
VALUE
|
|
bug_s_fstring(VALUE self, VALUE str)
|
|
{
|
|
return rb_fstring(str);
|
|
}
|
|
|
|
VALUE
|
|
bug_s_rb_enc_interned_str(VALUE self, VALUE encoding)
|
|
{
|
|
return rb_enc_interned_str("foo", 3, RDATA(encoding)->data);
|
|
}
|
|
|
|
VALUE
|
|
bug_s_rb_enc_str_new(VALUE self, VALUE encoding)
|
|
{
|
|
return rb_enc_str_new("foo", 3, RDATA(encoding)->data);
|
|
}
|
|
|
|
void
|
|
Init_string_fstring(VALUE klass)
|
|
{
|
|
rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
|
|
rb_define_singleton_method(klass, "rb_enc_interned_str", bug_s_rb_enc_interned_str, 1);
|
|
rb_define_singleton_method(klass, "rb_enc_str_new", bug_s_rb_enc_str_new, 1);
|
|
}
|