1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (parser_tokadd_mbchar): check insufficient multibyte char.

Browse Source 
[ruby-dev:32429]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-02 06:47:59 +00:00
parent 4fab2c7526
commit 040e3e7bdd
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,13 +1,18 @@
Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_tokadd_mbchar): check insufficient multibyte char.
[ruby-dev:32429]
Sun Dec 2 15:42:16 2007 Kouhei Sutou <kou@cozmixng.org> Sun Dec 2 15:42:16 2007 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.1 -> 0.2.2. * 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/itunes.rb: fixed new_itunes_category.
* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because * 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 * 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 <ko1@atdot.net> Sun Dec 2 15:18:37 2007 Koichi Sasada <ko1@atdot.net>

21
parse.y
View File

@ -5300,13 +5300,18 @@ dispose_string(VALUE str)
rb_gc_force_recycle(str); rb_gc_force_recycle(str);
} }
static void static int
parser_tokadd_mbchar(struct parser_params *parser, int c) parser_tokadd_mbchar(struct parser_params *parser, int c)
{ {
int len = parser_mbclen(); int len = parser_mbclen();
if (lex_p + len > lex_pend) {
compile_error(PARSER_ARG "illegal multibyte char");
return -1;
}
tokadd(c); tokadd(c);
lex_p += --len; lex_p += --len;
if (len > 0) tokcopy(len); if (len > 0) tokcopy(len);
return c;
} }
#define tokadd_mbchar(c) parser_tokadd_mbchar(parser, 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); mixed_error(enc, *encp);
continue; continue;
} }
tokadd_mbchar(c); if (tokadd_mbchar(c) == -1) return -1;
continue; continue;
} }
else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
@ -5521,8 +5526,7 @@ parser_heredoc_identifier(struct parser_params *parser)
tokadd(func); tokadd(func);
term = c; term = c;
while ((c = nextc()) != -1 && c != term) { while ((c = nextc()) != -1 && c != term) {
len = parser_mbclen(); if (tokadd_mbchar(c) == -1) return 0;
do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1);
} }
if (c == -1) { if (c == -1) {
compile_error(PARSER_ARG "unterminated here document identifier"); compile_error(PARSER_ARG "unterminated here document identifier");
@ -5542,8 +5546,7 @@ parser_heredoc_identifier(struct parser_params *parser)
term = '"'; term = '"';
tokadd(func |= str_dquote); tokadd(func |= str_dquote);
do { do {
len = parser_mbclen(); if (tokadd_mbchar(c) == -1) return 0;
do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1);
} while ((c = nextc()) != -1 && parser_is_identchar()); } while ((c = nextc()) != -1 && parser_is_identchar());
pushback(c); pushback(c);
break; break;
@ -6297,7 +6300,7 @@ parser_yylex(struct parser_params *parser)
newtok(); newtok();
enc = parser->enc; enc = parser->enc;
if (parser_ismbchar()) { if (parser_ismbchar()) {
tokadd_mbchar(c); if (tokadd_mbchar(c) == -1) return 0;
} }
else if ((rb_enc_isalnum(c, parser->enc) || c == '_') && else if ((rb_enc_isalnum(c, parser->enc) || c == '_') &&
lex_p < lex_pend && is_identchar(lex_p, lex_pend, parser->enc)) { lex_p < lex_pend && is_identchar(lex_p, lex_pend, parser->enc)) {
@ -6994,7 +6997,7 @@ parser_yylex(struct parser_params *parser)
tokadd(c); tokadd(c);
c = nextc(); c = nextc();
if (parser_is_identchar()) { if (parser_is_identchar()) {
tokadd_mbchar(c); if (tokadd_mbchar(c) == -1) return 0;
} }
else { else {
pushback(c); pushback(c);
@ -7091,7 +7094,7 @@ parser_yylex(struct parser_params *parser)
mb = ENC_CODERANGE_7BIT; mb = ENC_CODERANGE_7BIT;
do { do {
if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN; if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN;
tokadd_mbchar(c); if (tokadd_mbchar(c) == -1) return 0;
c = nextc(); c = nextc();
} while (parser_is_identchar()); } while (parser_is_identchar());
if ((c == '!' || c == '?') && !peek('=')) { if ((c == '!' || c == '?') && !peek('=')) {