summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2024-05-29 11:07:07 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2024-05-29 11:07:07 -0700
commit548c7cb9f517dcb8029bd9698187c81819e08edd (patch)
tree45ed193d5d7f36bf0fb66b9dbc919dd800122f79 /string.c
parent8f1084db9b07cb74f99de70d6f8bb6076d27d8aa (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 'string.c')
-rw-r--r--string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/string.c b/string.c
index cae234687d..3d4650ff05 100644
--- a/string.c
+++ b/string.c
@@ -12092,7 +12092,7 @@ rb_interned_str_cstr(const char *ptr)
VALUE
rb_enc_interned_str(const char *ptr, long len, rb_encoding *enc)
{
- if (UNLIKELY(rb_enc_autoload_p(enc))) {
+ if (enc != NULL && UNLIKELY(rb_enc_autoload_p(enc))) {
rb_enc_autoload(enc);
}