diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-12-20 19:04:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 19:04:24 +0900 |
| commit | 409f8f6995a5f9f805b2b604464a8ef032f71291 (patch) | |
| tree | 1ba6a5e98d77f899e968a676288c25593f9314ee | |
| parent | 2f693d31bebe9d414e0857556a005272b41bcba0 (diff) | |
| parent | 033dd10ac202a94a74652ad93e77c68937cc7b8e (diff) | |
| download | json-409f8f6995a5f9f805b2b604464a8ef032f71291.tar.gz | |
Merge pull request #359 from flori/pick-ruby-core
Backport from Ruby core repository
| -rw-r--r-- | ext/json/ext/parser/parser.c | 20 | ||||
| -rw-r--r-- | ext/json/ext/parser/parser.rl | 5 |
2 files changed, 15 insertions, 10 deletions
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c index d2e4eb6..f41aac5 100644 --- a/ext/json/ext/parser/parser.c +++ b/ext/json/ext/parser/parser.c @@ -1659,7 +1659,9 @@ case 7: if (json->symbolize_names && json->parsing_name) { *result = rb_str_intern(*result); } else { - rb_str_resize(*result, RSTRING_LEN(*result)); + if (RB_TYPE_P(*result, T_STRING)) { + rb_str_resize(*result, RSTRING_LEN(*result)); + } } if (cs >= JSON_string_first_final) { return p + 1; @@ -1830,7 +1832,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) } -#line 1834 "parser.c" +#line 1836 "parser.c" enum {JSON_start = 1}; enum {JSON_first_final = 10}; enum {JSON_error = 0}; @@ -1838,7 +1840,7 @@ enum {JSON_error = 0}; enum {JSON_en_main = 1}; -#line 742 "parser.rl" +#line 744 "parser.rl" /* @@ -1855,16 +1857,16 @@ static VALUE cParser_parse(VALUE self) GET_PARSER; -#line 1859 "parser.c" +#line 1861 "parser.c" { cs = JSON_start; } -#line 758 "parser.rl" +#line 760 "parser.rl" p = json->source; pe = p + json->len; -#line 1868 "parser.c" +#line 1870 "parser.c" { if ( p == pe ) goto _test_eof; @@ -1898,7 +1900,7 @@ st0: cs = 0; goto _out; tr2: -#line 734 "parser.rl" +#line 736 "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;} @@ -1908,7 +1910,7 @@ st10: if ( ++p == pe ) goto _test_eof10; case 10: -#line 1912 "parser.c" +#line 1914 "parser.c" switch( (*p) ) { case 13: goto st10; case 32: goto st10; @@ -1997,7 +1999,7 @@ case 9: _out: {} } -#line 761 "parser.rl" +#line 763 "parser.rl" if (cs >= JSON_first_final && p == pe) { return result; diff --git a/ext/json/ext/parser/parser.rl b/ext/json/ext/parser/parser.rl index 29900a4..edab32b 100644 --- a/ext/json/ext/parser/parser.rl +++ b/ext/json/ext/parser/parser.rl @@ -554,7 +554,9 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu if (json->symbolize_names && json->parsing_name) { *result = rb_str_intern(*result); } else { - rb_str_resize(*result, RSTRING_LEN(*result)); + if (RB_TYPE_P(*result, T_STRING)) { + rb_str_resize(*result, RSTRING_LEN(*result)); + } } if (cs >= JSON_string_first_final) { return p + 1; @@ -824,6 +826,7 @@ static VALUE cParser_source(VALUE self) void Init_parser(void) { +#undef rb_intern rb_require("json/common"); mJSON = rb_define_module("JSON"); mExt = rb_define_module_under(mJSON, "Ext"); |