summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-20 07:25:07 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-20 07:25:07 +0000
commitb1586df0c7fd367ceba7d4e52f48658214f8efae (patch)
treee5b0cd4f9057b7fe9e6a5019d800301a0a859cad
parentb6a9641ba836529c8ec9467382b096e0540fec76 (diff)
downloadruby-b1586df0c7fd367ceba7d4e52f48658214f8efae.tar.gz
ruby-b1586df0c7fd367ceba7d4e52f48658214f8efae.tar.xz
ruby-b1586df0c7fd367ceba7d4e52f48658214f8efae.zip
* gc.c (gc_mark_children): obj->as.file.fptr may be 0 for T_FILE.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e4aec4f61..e14fbc0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 20 16:24:31 2007 Tanaka Akira <akr@fsij.org>
+
+ * gc.c (gc_mark_children): obj->as.file.fptr may be 0 for T_FILE.
+
Tue Nov 20 15:09:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_read_escape): has8bit flag may be set with control
diff --git a/gc.c b/gc.c
index acb81b00d..66f095c09 100644
--- a/gc.c
+++ b/gc.c
@@ -1081,7 +1081,8 @@ gc_mark_children(VALUE ptr, int lev)
break;
case T_FILE:
- gc_mark(obj->as.file.fptr->tied_io_for_writing, lev);
+ if (obj->as.file.fptr)
+ gc_mark(obj->as.file.fptr->tied_io_for_writing, lev);
break;
case T_REGEXP: