aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--marshal.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 415419e4c5..2c5aa0778d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 16 17:46:59 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (r_byte): IO#getc returns one byte string now.
+ fixed: [ruby-dev:29255]
+
Wed Aug 16 17:22:44 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (pre-install-local): remove unnecessary code.
diff --git a/marshal.c b/marshal.c
index 1e6f8926a2..aa6a5943d8 100644
--- a/marshal.c
+++ b/marshal.c
@@ -757,7 +757,7 @@ r_byte(struct load_arg *arg)
VALUE src = arg->src;
VALUE v = rb_funcall2(src, s_getc, 0, 0);
if (NIL_P(v)) rb_eof_error();
- c = (unsigned char)FIX2INT(v);
+ c = (unsigned char)NUM2CHR(v);
}
return c;
}