From df5604ce5d5e01b064378eb886a72c939f82e2c4 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 17 Jul 2008 11:42:17 +0000 Subject: [PATCH] * pack.c (pack_unpack): fix v and V with big endian. [1].pack("V").unpack("V") was [4294967296]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14219db6d8..0641158e80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 17 20:41:42 2008 Yusuke Endoh + + * pack.c (pack_unpack): fix v and V with big endian. + [1].pack("V").unpack("V") was [4294967296]. + Thu Jul 17 20:35:03 2008 Yusuke Endoh * pack.c (pack_pack): fix i! with big endian. [1].pack("i!") was diff --git a/pack.c b/pack.c index 4dcdeca693..4e11c5d9b7 100644 --- a/pack.c +++ b/pack.c @@ -1617,7 +1617,7 @@ pack_unpack(VALUE str, VALUE fmt) PACK_LENGTH_ADJUST(unsigned short,2); while (len-- > 0) { unsigned short tmp = 0; - memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2)); + memcpy(&tmp, s, NATINT_LEN(unsigned short,2)); s += NATINT_LEN(unsigned short,2); UNPACK_PUSH(UINT2NUM(vtohs(tmp))); } @@ -1628,7 +1628,7 @@ pack_unpack(VALUE str, VALUE fmt) PACK_LENGTH_ADJUST(unsigned long,4); while (len-- > 0) { unsigned long tmp = 0; - memcpy(OFF32(&tmp), s, NATINT_LEN(long,4)); + memcpy(&tmp, s, NATINT_LEN(long,4)); s += NATINT_LEN(long,4); UNPACK_PUSH(ULONG2NUM(vtohl(tmp))); }