diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2024-05-29 11:07:07 -0700 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2024-05-29 11:07:07 -0700 |
| commit | 548c7cb9f517dcb8029bd9698187c81819e08edd (patch) | |
| tree | 45ed193d5d7f36bf0fb66b9dbc919dd800122f79 /ext | |
| parent | 8f1084db9b07cb74f99de70d6f8bb6076d27d8aa (diff) | |
merge revision(s) 7e4b1f8e1935a10df3c41ee60ca0987d73281126: [Backport #20322]
[Bug #20322] Fix rb_enc_interned_str_cstr null encoding
The documentation for `rb_enc_interned_str_cstr` notes that `enc` can be
a null pointer, but this currently causes a segmentation fault when
trying to autoload the encoding. This commit fixes the issue by checking
for NULL before calling `rb_enc_autoload`.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/string/fstring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c index 7ee14a8570..8dfa36e345 100644 --- a/ext/-test-/string/fstring.c +++ b/ext/-test-/string/fstring.c @@ -21,13 +21,13 @@ bug_s_fstring_fake_str(VALUE self) VALUE bug_s_rb_enc_interned_str(VALUE self, VALUE encoding) { - return rb_enc_interned_str("foo", 3, RDATA(encoding)->data); + return rb_enc_interned_str("foo", 3, NIL_P(encoding) ? NULL : RDATA(encoding)->data); } VALUE bug_s_rb_enc_str_new(VALUE self, VALUE encoding) { - return rb_enc_str_new("foo", 3, RDATA(encoding)->data); + return rb_enc_str_new("foo", 3, NIL_P(encoding) ? NULL : RDATA(encoding)->data); } void |