aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-13 04:10:24 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-13 04:10:24 +0000
commit266d186bcf06aab76ed14afd97199d9699c7295e (patch)
tree15b670a25e4d1e1005ee4e8f8ddd165b39610931
parentb21aa43b4c1e8f450040fac2125f73c96f35303e (diff)
downloadruby-266d186bcf06aab76ed14afd97199d9699c7295e.tar.gz
* include/ruby/io.h (MakeOpenFile): fptr->enc should be
intialized to zero. [ruby-dev:32569] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/io.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fe8fe2aaf8..23fffa8a04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 13 13:09:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * include/ruby/io.h (MakeOpenFile): fptr->enc should be
+ intialized to zero. [ruby-dev:32569]
+
Thu Dec 13 08:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_getc): use default external encoding if fptr->enc is
diff --git a/include/ruby/io.h b/include/ruby/io.h
index c2e0eaa2fc..5111592935 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -90,6 +90,7 @@ typedef struct rb_io_t {
fp->rbuf_len = 0;\
fp->rbuf_capa = 0;\
fp->tied_io_for_writing = 0;\
+ fp->enc = 0;\
} while (0)
FILE *rb_io_stdio_file(rb_io_t *fptr);