kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (parser_read_escape, parser_tokadd_escape): check code range.

Browse source 
[ruby-dev:31980]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-10-09 07:01:36 +00:00
parent 04da3111ef
commit 51baef22a6
2 changed files with 42 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Oct 9 16:00:32 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* parse.y (parser_read_escape, parser_tokadd_escape): check code range.
[ruby-dev:31980]
Tue Oct 9 15:40:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 9 15:40:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (STR_NEW3): check for if single byte sequence. * parse.y (STR_NEW3): check for if single byte sequence.

75
parse.y
View file

@ -4491,8 +4491,8 @@ static int parser_here_document(struct parser_params*,NODE*);
# define pushback(c) parser_pushback(parser, c) # define pushback(c) parser_pushback(parser, c)
# define newtok() parser_newtok(parser) # define newtok() parser_newtok(parser)
# define tokadd(c) parser_tokadd(parser, c) # define tokadd(c) parser_tokadd(parser, c)
# define read_escape() parser_read_escape(parser) # define read_escape(m) parser_read_escape(parser, m)
# define tokadd_escape(t) parser_tokadd_escape(parser, t) # define tokadd_escape(t,m) parser_tokadd_escape(parser, t, m)
# define regx_options() parser_regx_options(parser) # define regx_options() parser_regx_options(parser)
# define tokadd_string(f,t,p,n,m) parser_tokadd_string(parser,f,t,p,n,m) # define tokadd_string(f,t,p,n,m) parser_tokadd_string(parser,f,t,p,n,m)
# define parse_string(n) parser_parse_string(parser,n) # define parse_string(n) parser_parse_string(parser,n)
@ -4920,7 +4920,7 @@ parser_tokadd(struct parser_params *parser, int c)
} }
static int static int
parser_read_escape(struct parser_params *parser) parser_read_escape(struct parser_params *parser, int *mb)
{ {
int c; int c;
@ -4958,6 +4958,7 @@ parser_read_escape(struct parser_params *parser)
c = scan_oct(lex_p, 3, &numlen); c = scan_oct(lex_p, 3, &numlen);
lex_p += numlen; lex_p += numlen;
} }
if (mb && (c >= 0200)) *mb = ENC_CODERANGE_UNKNOWN;
return c; return c;
case 'x': /* hex constant */ case 'x': /* hex constant */
@ -4971,6 +4972,7 @@ parser_read_escape(struct parser_params *parser)
} }
lex_p += numlen; lex_p += numlen;
} }
if (mb && (c >= 0x80)) *mb = ENC_CODERANGE_UNKNOWN;
return c; return c;
case 'b': /* backspace */ case 'b': /* backspace */
@ -4986,10 +4988,12 @@ parser_read_escape(struct parser_params *parser)
return '\0'; return '\0';
} }
if ((c = nextc()) == '\\') { if ((c = nextc()) == '\\') {
return read_escape() | 0x80; if (mb) *mb = ENC_CODERANGE_UNKNOWN;
return read_escape(0) | 0x80;
} }
else if (c == -1) goto eof; else if (c == -1) goto eof;
else { else {
if (mb) *mb = ENC_CODERANGE_UNKNOWN;
return ((c & 0xff) | 0x80); return ((c & 0xff) | 0x80);
} }
@ -5001,7 +5005,7 @@ parser_read_escape(struct parser_params *parser)
} }
case 'c': case 'c':
if ((c = nextc())== '\\') { if ((c = nextc())== '\\') {
c = read_escape(); c = read_escape(mb);
} }
else if (c == '?') else if (c == '?')
return 0177; return 0177;
@ -5019,7 +5023,7 @@ parser_read_escape(struct parser_params *parser)
} }
static int static int
parser_tokadd_escape(struct parser_params *parser, int term) parser_tokadd_escape(struct parser_params *parser, int term, int *mb)
{ {
int c; int c;
@ -5029,36 +5033,38 @@ parser_tokadd_escape(struct parser_params *parser, int term)
case '0': case '1': case '2': case '3': /* octal constant */ case '0': case '1': case '2': case '3': /* octal constant */
case '4': case '5': case '6': case '7': case '4': case '5': case '6': case '7':
{
int i;
tokadd('\\');
tokadd(c);
for (i=0; i<2; i++) {
c = nextc();
if (c == -1) goto eof;
if (c < '0' || '7' < c) {
pushback(c);
break;
}
tokadd(c);
}
}
return 0;
case 'x': /* hex constant */
{ {
int numlen; int numlen;
int oct;
tokadd('\\'); tokadd('\\');
tokadd(c); pushback(c);
scan_hex(lex_p, 2, &numlen); oct = scan_oct(lex_p, 3, &numlen);
if (numlen == 0) { if (numlen == 0) {
yyerror("Invalid escape character syntax"); yyerror("Invalid escape character syntax");
return -1; return -1;
} }
while (numlen--) while (numlen--)
tokadd(nextc()); tokadd(nextc());
if (mb && (oct >= 0200)) *mb = ENC_CODERANGE_UNKNOWN;
}
return 0;
case 'x': /* hex constant */
{
int numlen;
int hex;
tokadd('\\');
tokadd(c);
hex = scan_hex(lex_p, 2, &numlen);
if (numlen == 0) {
yyerror("Invalid escape character syntax");
return -1;
}
while (numlen--)
tokadd(nextc());
if (mb && (hex >= 0x80)) *mb = ENC_CODERANGE_UNKNOWN;
} }
return 0; return 0;
@ -5069,6 +5075,7 @@ parser_tokadd_escape(struct parser_params *parser, int term)
return 0; return 0;
} }
tokadd('\\'); tokadd('M'); tokadd('-'); tokadd('\\'); tokadd('M'); tokadd('-');
if (mb) *mb = ENC_CODERANGE_UNKNOWN;
goto escaped; goto escaped;
case 'C': case 'C':
@ -5084,7 +5091,7 @@ parser_tokadd_escape(struct parser_params *parser, int term)
tokadd('\\'); tokadd('c'); tokadd('\\'); tokadd('c');
escaped: escaped:
if ((c = nextc()) == '\\') { if ((c = nextc()) == '\\') {
return tokadd_escape(term); return tokadd_escape(term, mb);
} }
else if (c == -1) goto eof; else if (c == -1) goto eof;
tokadd(c); tokadd(c);
@ -5212,22 +5219,14 @@ parser_tokadd_string(struct parser_params *parser,
default: default:
if (func & STR_FUNC_REGEXP) { if (func & STR_FUNC_REGEXP) {
pushback(c); pushback(c);
if (tokadd_escape(term) < 0) if (tokadd_escape(term, mb) < 0)
return -1; return -1;
if (mb) {
*mb = ENC_CODERANGE_UNKNOWN;
mb = 0;
}
continue; continue;
} }
else if (func & STR_FUNC_EXPAND) { else if (func & STR_FUNC_EXPAND) {
pushback(c); pushback(c);
if (func & STR_FUNC_ESCAPE) tokadd('\\'); if (func & STR_FUNC_ESCAPE) tokadd('\\');
c = read_escape(); c = read_escape(mb);
if (mb) {
*mb = ENC_CODERANGE_UNKNOWN;
mb = 0;
}
} }
else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) { else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
/* ignore backslashed spaces in %w */ /* ignore backslashed spaces in %w */
@ -6043,7 +6042,7 @@ parser_yylex(struct parser_params *parser)
goto ternary; goto ternary;
} }
else if (c == '\\') { else if (c == '\\') {
c = read_escape(); c = read_escape(0);
tokadd(c); tokadd(c);
} }
else { else {