From 92e0f99d375648b9f12dd25a556eace54a3aa6af Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 8 Dec 2008 09:31:44 +0000 Subject: * pack.c (pack_pack): fixed length for odd length string. [ruby-dev:37283] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 4 ++-- test/ruby/test_pack.rb | 12 ++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97cfca36c0..829e3e5fdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 8 18:31:41 2008 Nobuyoshi Nakada + + * pack.c (pack_pack): fixed length for odd length string. + [ruby-dev:37283] + Mon Dec 8 11:28:14 2008 Nobuyoshi Nakada * ruby.c (proc_options): added version, copyright, usage, yydebug, diff --git a/pack.c b/pack.c index 718f977d35..f353d67c87 100644 --- a/pack.c +++ b/pack.c @@ -620,7 +620,7 @@ pack_pack(VALUE ary, VALUE fmt) long i, j = 0; if (len > plen) { - j = (len - plen + 1)/2; + j = (len + 1) / 2 - (plen + 1) / 2; len = plen; } for (i=0; i++ < len; ptr++) { @@ -651,7 +651,7 @@ pack_pack(VALUE ary, VALUE fmt) long i, j = 0; if (len > plen) { - j = (len - plen + 1)/2; + j = (len + 1) / 2 - (plen + 1) / 2; len = plen; } for (i=0; i++ < len; ptr++) { diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 33694b9f38..6101a30219 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -179,11 +179,23 @@ class TestPack < Test::Unit::TestCase assert_equal("", ["10ef"].pack("h0")) assert_equal("\x01\x0e", ["10ef"].pack("h3")) assert_equal("\x01\xfe\x0", ["10ef"].pack("h5")) + assert_equal("\xff\x0f", ["fff"].pack("h3")) + assert_equal("\xff\x0f", ["fff"].pack("h4")) + assert_equal("\xff\x0f\0", ["fff"].pack("h5")) + assert_equal("\xff\x0f\0", ["fff"].pack("h6")) + assert_equal("\xff\x0f\0\0", ["fff"].pack("h7")) + assert_equal("\xff\x0f\0\0", ["fff"].pack("h8")) assert_equal("\x10\xef", ["10ef"].pack("H*")) assert_equal("", ["10ef"].pack("H0")) assert_equal("\x10\xe0", ["10ef"].pack("H3")) assert_equal("\x10\xef\x0", ["10ef"].pack("H5")) + assert_equal("\xff\xf0", ["fff"].pack("H3")) + assert_equal("\xff\xf0", ["fff"].pack("H4")) + assert_equal("\xff\xf0\0", ["fff"].pack("H5")) + assert_equal("\xff\xf0\0", ["fff"].pack("H6")) + assert_equal("\xff\xf0\0\0", ["fff"].pack("H7")) + assert_equal("\xff\xf0\0\0", ["fff"].pack("H8")) assert_equal(["10ef"], "\x01\xfe".unpack("h*")) assert_equal([""], "\x01\xfe".unpack("h0")) -- cgit v1.2.3