From 1cf42d35dd4e9d4fc20a6873bf389eff028b60a3 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 17 Jul 2008 11:42:17 +0000 Subject: * pack.c (pack_unpack): fix v and V with big endian. [1].pack("V").unpack("V") was [4294967296]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pack.c') diff --git a/pack.c b/pack.c index 4dcdeca69..4e11c5d9b 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))); } -- cgit