archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* io.c (rb_file_open_internal): should initialize fmode before using.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-10-21 01:40:41 +00:00
parent 05a157ed8a
commit 4442095d4c
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Oct 21 10:40:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_file_open_internal): should initialize fmode before using.
Tue Oct 21 08:56:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 21 08:56:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* regparse.c (parse_char_class): CCV_SB is only for single * regparse.c (parse_char_class): CCV_SB is only for single

5
io.c
View file

@ -4150,10 +4150,10 @@ rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode, convconfig
static VALUE static VALUE
rb_file_open_internal(VALUE io, VALUE filename, const char *modestr) rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
{ {
int fmode; int fmode = rb_io_modestr_fmode(modestr);
const char *p = strchr(modestr, ':'); const char *p = strchr(modestr, ':');
convconfig_t convconfig; convconfig_t convconfig;
if (p) { if (p) {
parse_mode_enc(p+1, &convconfig.enc, &convconfig.enc2); parse_mode_enc(p+1, &convconfig.enc, &convconfig.enc2);
} }
@ -4167,7 +4167,6 @@ rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
convconfig.ecopts = Qnil; convconfig.ecopts = Qnil;
} }
fmode = rb_io_modestr_fmode(modestr);
return rb_file_open_generic(io, filename, return rb_file_open_generic(io, filename,
rb_io_fmode_oflags(fmode), rb_io_fmode_oflags(fmode),
fmode, fmode,