From e26e05c4abf76d751bd17704b55ab550a9fe024e Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 13 Jan 2008 04:53:02 +0000 Subject: [PATCH] * ruby.c (load_file): local variable was not initialized when -x flag is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- ruby.c | 3 +-- 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 +Sun Jan 13 13:53:00 2008 Nobuyoshi Nakada + + * 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);