Skip to content

[pull] master from ruby:master #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 19, 2026
+10 −2
Merged

[pull] master from ruby:master #946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ext/json/generator/generator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,9 +819,17 @@ static VALUE encode_json_string_rescue(VALUE str, VALUE exception)
return Qundef;
}

static inline int json_str_coderange(VALUE str) {
int coderange = RB_ENC_CODERANGE(str);
if (coderange == RUBY_ENC_CODERANGE_UNKNOWN) {
coderange = rb_enc_str_coderange(str);
}
return coderange;
}

static inline bool valid_json_string_p(VALUE str)
{
int coderange = rb_enc_str_coderange(str);
int coderange = json_str_coderange(str);

if (RB_LIKELY(coderange == ENC_CODERANGE_7BIT)) {
return true;
Expand Down Expand Up @@ -893,7 +901,7 @@ static void raw_generate_json_string(FBuffer *buffer, struct generate_json_data
search.chunk_end = NULL;
#endif /* HAVE_SIMD */

switch (rb_enc_str_coderange(obj)) {
switch (json_str_coderange(obj)) {
case ENC_CODERANGE_7BIT:
case ENC_CODERANGE_VALID:
if (RB_UNLIKELY(data->state->ascii_only)) {
Expand Down