2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ec402c27f..bf0c035a26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 13 19:38:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file_internal): no need to define DATA when error.
+
 Sun Sep 13 18:48:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (XLDFLAGS): link startup code with ObjC support.
diff --git a/ruby.c b/ruby.c
index bcc49d4ef2..c122b09bc6 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1584,7 +1584,7 @@ load_file_internal(VALUE arg)
     rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
     tree = rb_parser_compile_file(parser, fname, f, line_start);
     rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
-    if (script && rb_parser_end_seen_p(parser)) {
+    if (script && tree && rb_parser_end_seen_p(parser)) {
 	rb_define_global_const("DATA", f);
     }
     else if (f != rb_stdin) {