From 1f26578da0fa056a58030abd231732d19e59492e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 21 Nov 2005 13:52:49 +0000 Subject: * parse.y (dsym): prohibit empty symbol literal by interpolation. fixed: [ruby-talk:166529] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- parse.y | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 818c814389..8a11158035 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ -Mon Nov 21 22:19:33 2005 Nobuyoshi Nakada +Mon Nov 21 22:50:48 2005 Nobuyoshi Nakada * file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path should not be splitted. fixed: [ruby-dev:27776] [ruby-dev:27786] + * parse.y (dsym): prohibit empty symbol literal by interpolation. + fixed: [ruby-talk:166529] + Mon Nov 21 16:03:48 2005 Nobuyoshi Nakada * win32/setup.mk: findstr doesn't exist on win9x. diff --git a/parse.y b/parse.y index dd0e46b99b..aafc821a87 100644 --- a/parse.y +++ b/parse.y @@ -2143,12 +2143,19 @@ dsym : tSYMBEG xstring_contents tSTRING_END yyerror("empty symbol literal"); } else { + VALUE lit; + switch (nd_type($$)) { case NODE_DSTR: nd_set_type($$, NODE_DSYM); break; case NODE_STR: - if (strlen(RSTRING($$->nd_lit)->ptr) == RSTRING($$->nd_lit)->len) { + lit = $$->nd_lit; + if (RSTRING(lit)->len == 0) { + yyerror("empty symbol literal"); + break; + } + if (strlen(RSTRING(lit)->ptr) == RSTRING(lit)->len) { $$->nd_lit = ID2SYM(rb_intern(RSTRING($$->nd_lit)->ptr)); nd_set_type($$, NODE_LIT); break; -- cgit v1.2.3