summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-10 07:55:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-10 07:55:40 +0000
commit1995213e4bb0b6411a4a4da60c53e37bec3ba4ec (patch)
treeba2af51029a01ca4ac835617ea86c36621db7d64
parentb1f086d01492e4cc69f38d965775144f92cd5506 (diff)
* ruby.c (load_file): avoid SEGV on '#' only input.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c1
-rw-r--r--version.h4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a44ee19ac6..6149a50bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 10 16:52:53 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * ruby.c (load_file): avoid SEGV on '#' only input.
+
Fri Feb 8 23:07:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_eval): singleton chech should be moved from yycompile
diff --git a/ruby.c b/ruby.c
index f73194bbec..bd7d599ac0 100644
--- a/ruby.c
+++ b/ruby.c
@@ -794,6 +794,7 @@ load_file(fname, script)
c = rb_io_getc(f);
if (c == INT2FIX('#')) {
line = rb_io_gets(f);
+ if (NIL_P(line)) return;
line_start++;
if (RSTRING(line)->len > 2 && RSTRING(line)->ptr[0] == '!') {
diff --git a/version.h b/version.h
index 97a5407369..9075c84a1c 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.2"
-#define RUBY_RELEASE_DATE "2002-02-09"
+#define RUBY_RELEASE_DATE "2002-02-10"
#define RUBY_VERSION_CODE 172
-#define RUBY_RELEASE_CODE 20020209
+#define RUBY_RELEASE_CODE 20020210