aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ruby.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 74bb677100..421f4f3fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Jan 13 13:50:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 13 13:53:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (load_file): local variable was not initialized when -x flag
+ is given.
* ruby.c (load_file): script files should not be affected by locale.
[ruby-dev:33054]
diff --git a/ruby.c b/ruby.c
index e3b700bdc1..7feef787ff 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1064,6 +1064,7 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
VALUE c = 1; /* something not nil */
VALUE line;
char *p;
+ int no_enc = !opt->enc_name;
if (opt->xflag) {
forbid_setid("-x");
@@ -1083,8 +1084,6 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
c = rb_io_getbyte(f);
if (c == INT2FIX('#')) {
- int no_enc = !opt->enc_name;
-
c = rb_io_getbyte(f);
if (c == INT2FIX('!')) {
line = rb_io_gets(f);