summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-10 14:21:04 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-10 14:21:04 +0000
commitf188db310555c347544d29916dd4a270b8a7419c (patch)
tree27437bd428ea7dbb525faf4af75328caa07d8818
parentcdeed3b3ebb6a03f5ee265e1dd98f327fdbb7a8c (diff)
Fix condition of second byte of UTF-16LE/UTF-32LE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f33172ee7..868c5e7cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 10 23:04:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (io_strip_bom): Fix condition of second byte of
+ UTF-16LE/UTF-32LE.
+
Fri Jul 10 21:45:30 2009 TAKAO Kouji <kouji@takao7.net>
* ext/readline/extconf.rb: checked rl_refresh_line in readline.
diff --git a/io.c b/io.c
index b73dbe80e3..78b87fc6ac 100644
--- a/io.c
+++ b/io.c
@@ -4554,7 +4554,7 @@ io_strip_bom(VALUE io)
case 0xFF:
b2 = FIX2INT(rb_io_getbyte(io));
- if (b2 == 0xFF) {
+ if (b2 == 0xFE) {
b3 = FIX2INT(rb_io_getbyte(io));
if (b3 == 0) {
b4 = FIX2INT(rb_io_getbyte(io));