diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-08 02:46:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-08 02:46:39 +0000 |
commit | e41a1c0f10db58206394bbef056a0613c353ab92 (patch) | |
tree | a62de6522301e526de6c42a444e9f5094b25af83 | |
parent | ec8d7f3672e379700d90d8ed0deab767584e5e76 (diff) | |
download | ruby-e41a1c0f10db58206394bbef056a0613c353ab92.tar.gz |
* parse.y (string_content): get rid of segfault at empty evstr.
fixed: [ruby-dev:25113]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ruby/test_system.rb | 4 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Dec 8 11:46:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (string_content): get rid of segfault at empty evstr. + fixed: [ruby-dev:25113] + Wed Dec 8 03:26:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_bio.c (ossl_obj2bio): should not use fptr->f. @@ -3599,7 +3599,7 @@ string_content : tSTRING_CONTENT COND_LEXPOP(); CMDARG_LEXPOP(); /*%%%*/ - $3->flags &= ~NODE_NEWLINE; + if ($3) $3->flags &= ~NODE_NEWLINE; $$ = new_evstr($3); /*% $$ = dispatch1(string_embexpr, $3); diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb index 410dd83e2a..826c615cd3 100644 --- a/test/ruby/test_system.rb +++ b/test/ruby/test_system.rb @@ -60,4 +60,8 @@ class TestSystem < Test::Unit::TestCase end end end + + def test_empty_evstr # [ruby-dev:25113] + assert_equal("", eval('"#{}"', nil, __FILE__, __LINE__)) + end end |