aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-07 06:41:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-01-07 06:41:24 +0000
commitb1860ba7dc2988e99d77391a3696a04b9d2ef2f8 (patch)
tree6cd99958bb8ce577bfc0fbfe3ed1342706a46e05
parent199ef57934de0fd0bf2d1682df8714f85b65dfcc (diff)
downloadruby-b1860ba7dc2988e99d77391a3696a04b9d2ef2f8.tar.gz
* parse.y (singleton): get rid of segfault on syntax error.
fixed: [ruby-core:07070] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index afacc5cdf8..023ac4c54d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 7 15:40:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (singleton): get rid of segfault on syntax error.
+ fixed: [ruby-core:07070]
+
Sat Jan 7 06:24:18 2006 Tanaka Akira <akr@m17n.org>
* eval.c (rb_fd_isset): compare the result of FD_ISSET with 0 to
diff --git a/parse.y b/parse.y
index f3a7a42f51..2b8af2f279 100644
--- a/parse.y
+++ b/parse.y
@@ -4246,7 +4246,7 @@ opt_f_block_arg : ',' f_block_arg
singleton : var_ref
{
/*%%%*/
- if (nd_type($1) == NODE_SELF) {
+ if ($1 && nd_type($1) == NODE_SELF) {
$$ = NEW_SELF();
}
else {