diff options
| author | Jean Boussier <[email protected]> | 2024-10-21 22:19:44 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2024-10-26 18:44:15 +0900 |
| commit | fc9f0cb8c5ead74455370f2ae409bc4a6b1dedc0 () | |
| tree | f289961afc78ca5903e306e7d17cad870f3e9a46 /ext/json | |
| parent | 2c6e3bc71e12e12ad6949502e2b161171ca56840 (diff) | |
[ruby/json] JSON.dump / String#to_json: raise on invalid encoding
This regressed since 2.7.2. https://.com/ruby/json/commit/35407d6635
| -rw-r--r-- | ext/json/generator/generator.c | 40 | ||||
| -rw-r--r-- | ext/json/parser/parser.c | 19 | ||||
| -rw-r--r-- | ext/json/parser/parser.rl | 3 |
3 files changed, 47 insertions, 15 deletions
@@ -5,9 +5,9 @@ #define RB_UNLIKELY(cond) (cond) #endif -static VALUE mJSON, cState, mString_Extend, eGeneratorError, eNestingError; -static ID i_to_s, i_to_json, i_new, i_pack, i_unpack, i_create_id, i_extend; /* Converts in_string to a JSON string (without the wrapping '"' * characters) in FBuffer out_buffer. @@ -735,20 +735,41 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St fbuffer_append_char(buffer, ']'); } -static int usascii_encindex, utf8_encindex; -static int enc_utf8_compatible_p(int enc_idx) { if (enc_idx == usascii_encindex) return 1; if (enc_idx == utf8_encindex) return 1; return 0; } static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj) { - if (!enc_utf8_compatible_p(RB_ENCODING_GET(obj))) { - obj = rb_str_export_to_enc(obj, rb_utf8_encoding()); - } fbuffer_append_char(buffer, '"'); @@ -1462,6 +1483,9 @@ void Init_generator(void) VALUE mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass"); rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1); i_to_s = rb_intern("to_s"); i_to_json = rb_intern("to_json"); i_new = rb_intern("new"); @@ -1469,7 +1493,9 @@ void Init_generator(void) i_unpack = rb_intern("unpack"); i_create_id = rb_intern("create_id"); i_extend = rb_intern("extend"); usascii_encindex = rb_usascii_encindex(); utf8_encindex = rb_utf8_encindex(); } @@ -1794,6 +1794,9 @@ static VALUE convert_encoding(VALUE source) } if (encindex == binary_encindex) { return rb_enc_associate_index(rb_str_dup(source), utf8_encindex); } @@ -1943,7 +1946,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) } -#line 1947 "parser.c" enum {JSON_start = 1}; enum {JSON_first_final = 10}; enum {JSON_error = 0}; @@ -1951,7 +1954,7 @@ enum {JSON_error = 0}; enum {JSON_en_main = 1}; -#line 855 "parser.rl" /* @@ -1969,16 +1972,16 @@ static VALUE cParser_parse(VALUE self) GET_PARSER; -#line 1973 "parser.c" { cs = JSON_start; } -#line 872 "parser.rl" p = json->source; pe = p + json->len; -#line 1982 "parser.c" { if ( p == pe ) goto _test_eof; @@ -2012,7 +2015,7 @@ st0: cs = 0; goto _out; tr2: -#line 847 "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;} @@ -2022,7 +2025,7 @@ st10: if ( ++p == pe ) goto _test_eof10; case 10: -#line 2026 "parser.c" switch( (*p) ) { case 13: goto st10; case 32: goto st10; @@ -2111,7 +2114,7 @@ case 9: _out: {} } -#line 875 "parser.rl" if (cs >= JSON_first_final && p == pe) { return result; @@ -689,6 +689,9 @@ static VALUE convert_encoding(VALUE source) } if (encindex == binary_encindex) { return rb_enc_associate_index(rb_str_dup(source), utf8_encindex); } |