diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 13:05:58 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 13:05:58 +0000 |
commit | 5974191113ade01641a3799192f5cb0f12fe1e9d (patch) | |
tree | f55ca2152d5980351eefa57ae746da8c89f7693b /parse.y | |
parent | 25a2e376bb3cfcbbfadc856bf3c29c4376ec8caf (diff) |
merge revision(s) 59161: [Backport #13672]
parse.y: check multibyte char
* parse.y (parser_precise_mbclen): check invalid multibyte char at
skipping strings following `?x` literal string, not to stuck in
a infinite loop. [ruby-core:81746] [Bug #13672]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -5333,7 +5333,6 @@ ripper_dispatch_delayed_token(struct parser_params *parser, int t) #define parser_encoding_name() (current_enc->name) #define parser_mbclen() mbclen((lex_p-1),lex_pend,current_enc) -#define parser_precise_mbclen() rb_enc_precise_mbclen((lex_p-1),lex_pend,current_enc) #define is_identchar(p,e,enc) (rb_enc_isalnum((unsigned char)(*(p)),(enc)) || (*(p)) == '_' || !ISASCII(*(p))) #define parser_is_identchar() (!parser->eofp && is_identchar((lex_p-1),lex_pend,current_enc)) @@ -5407,6 +5406,18 @@ token_info_pop(struct parser_params *parser, const char *token, size_t len) } static int +parser_precise_mbclen(struct parser_params *parser, const char *p) +{ + int len = rb_enc_precise_mbclen(p, lex_pend, current_enc); + if (!MBCLEN_CHARFOUND_P(len)) { + compile_error(PARSER_ARG "invalid multibyte char (%s)", parser_encoding_name()); + return -1; + } + + return len; +} + +static int parser_yyerror(struct parser_params *parser, const char *msg) { #ifndef RIPPER @@ -6186,11 +6197,8 @@ dispose_string(VALUE str) static int parser_tokadd_mbchar(struct parser_params *parser, int c) { - int len = parser_precise_mbclen(); - if (!MBCLEN_CHARFOUND_P(len)) { - compile_error(PARSER_ARG "invalid multibyte char (%s)", parser_encoding_name()); - return -1; - } + int len = parser_precise_mbclen(parser, lex_p-1); + if (len < 0) return -1; tokadd(c); lex_p += --len; if (len > 0) tokcopy(len); |