diff options
| author | Jean Boussier <[email protected]> | 2024-10-24 16:04:50 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2024-11-01 13:04:24 +0900 |
| commit | 3782600f0f4f2f70a4d17f025fde6c096f82b424 (patch) | |
| tree | 8525ebd02821006520cdd9c1f22a59372a624eb3 /ext/json/parser/parser.c | |
| parent | f2b8829df0092409c944aafeac03f72ab2a6e7ac (diff) | |
[ruby/json] Emit warnings when dumping binary strings
Because of it's Ruby 1.8 heritage, the C extension doesn't care
much about strings encoding. We should get stricter over time.
https://github.com/ruby/json/commit/42402fc13f
Diffstat (limited to 'ext/json/parser/parser.c')
| -rw-r--r-- | ext/json/parser/parser.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index 38c546b46b..9d2c1a5ea3 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1798,9 +1798,12 @@ static VALUE convert_encoding(VALUE source) if (encindex == binary_encindex) { // For historical reason, we silently reinterpret binary strings as UTF-8 if it would work. - // TODO: Deprecate in 2.8.0 - // TODO: Remove in 3.0.0 - return rb_enc_associate_index(rb_str_dup(source), utf8_encindex); + VALUE utf8_string = rb_enc_associate_index(rb_str_dup(source), utf8_encindex); + switch (rb_enc_str_coderange(utf8_string)) { + case ENC_CODERANGE_7BIT: + case ENC_CODERANGE_VALID: + return utf8_string; + } } return rb_str_conv_enc(source, rb_enc_from_index(encindex), rb_utf8_encoding()); @@ -1955,7 +1958,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) } -#line 1959 "parser.c" +#line 1962 "parser.c" enum {JSON_start = 1}; enum {JSON_first_final = 10}; enum {JSON_error = 0}; @@ -1963,7 +1966,7 @@ enum {JSON_error = 0}; enum {JSON_en_main = 1}; -#line 867 "parser.rl" +#line 870 "parser.rl" /* @@ -1981,16 +1984,16 @@ static VALUE cParser_parse(VALUE self) GET_PARSER; -#line 1985 "parser.c" +#line 1988 "parser.c" { cs = JSON_start; } -#line 884 "parser.rl" +#line 887 "parser.rl" p = json->source; pe = p + json->len; -#line 1994 "parser.c" +#line 1997 "parser.c" { if ( p == pe ) goto _test_eof; @@ -2024,7 +2027,7 @@ st0: cs = 0; goto _out; tr2: -#line 859 "parser.rl" +#line 862 "parser.rl" { char *np = JSON_parse_value(json, p, pe, &result, 0); if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;} @@ -2034,7 +2037,7 @@ st10: if ( ++p == pe ) goto _test_eof10; case 10: -#line 2038 "parser.c" +#line 2041 "parser.c" switch( (*p) ) { case 13: goto st10; case 32: goto st10; @@ -2123,7 +2126,7 @@ case 9: _out: {} } -#line 887 "parser.rl" +#line 890 "parser.rl" if (cs >= JSON_first_final && p == pe) { return result; |