From 040e3e7bddb7269e25b2e88f8135d7fc9bbe1afd Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 2 Dec 2007 06:47:59 +0000 Subject: [PATCH] * parse.y (parser_tokadd_mbchar): check insufficient multibyte char. [ruby-dev:32429] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++-- parse.y | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0dcc79f0b..da152aca88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,18 @@ +Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada + + * parse.y (parser_tokadd_mbchar): check insufficient multibyte char. + [ruby-dev:32429] + Sun Dec 2 15:42:16 2007 Kouhei Sutou * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.1 -> 0.2.2. * lib/rss/maker/itunes.rb: fixed new_itunes_category. * lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because - of consistency. + of consistency. * test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed - needless UTF-8 characters. + needless UTF-8 characters. Sun Dec 2 15:18:37 2007 Koichi Sasada diff --git a/parse.y b/parse.y index 2bfd9e09b0..6e67fd92d2 100644 --- a/parse.y +++ b/parse.y @@ -5300,13 +5300,18 @@ dispose_string(VALUE str) rb_gc_force_recycle(str); } -static void +static int parser_tokadd_mbchar(struct parser_params *parser, int c) { int len = parser_mbclen(); + if (lex_p + len > lex_pend) { + compile_error(PARSER_ARG "illegal multibyte char"); + return -1; + } tokadd(c); lex_p += --len; if (len > 0) tokcopy(len); + return c; } #define tokadd_mbchar(c) parser_tokadd_mbchar(parser, c) @@ -5413,7 +5418,7 @@ parser_tokadd_string(struct parser_params *parser, mixed_error(enc, *encp); continue; } - tokadd_mbchar(c); + if (tokadd_mbchar(c) == -1) return -1; continue; } else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { @@ -5521,8 +5526,7 @@ parser_heredoc_identifier(struct parser_params *parser) tokadd(func); term = c; while ((c = nextc()) != -1 && c != term) { - len = parser_mbclen(); - do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1); + if (tokadd_mbchar(c) == -1) return 0; } if (c == -1) { compile_error(PARSER_ARG "unterminated here document identifier"); @@ -5542,8 +5546,7 @@ parser_heredoc_identifier(struct parser_params *parser) term = '"'; tokadd(func |= str_dquote); do { - len = parser_mbclen(); - do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1); + if (tokadd_mbchar(c) == -1) return 0; } while ((c = nextc()) != -1 && parser_is_identchar()); pushback(c); break; @@ -6297,7 +6300,7 @@ parser_yylex(struct parser_params *parser) newtok(); enc = parser->enc; if (parser_ismbchar()) { - tokadd_mbchar(c); + if (tokadd_mbchar(c) == -1) return 0; } else if ((rb_enc_isalnum(c, parser->enc) || c == '_') && lex_p < lex_pend && is_identchar(lex_p, lex_pend, parser->enc)) { @@ -6994,7 +6997,7 @@ parser_yylex(struct parser_params *parser) tokadd(c); c = nextc(); if (parser_is_identchar()) { - tokadd_mbchar(c); + if (tokadd_mbchar(c) == -1) return 0; } else { pushback(c); @@ -7091,7 +7094,7 @@ parser_yylex(struct parser_params *parser) mb = ENC_CODERANGE_7BIT; do { if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN; - tokadd_mbchar(c); + if (tokadd_mbchar(c) == -1) return 0; c = nextc(); } while (parser_is_identchar()); if ((c == '!' || c == '?') && !peek('=')) {