kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* pack.c (pack_pack): fixed length for odd length string.

Browse source 
[ruby-dev:37283]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-12-08 09:31:44 +00:00
parent 8445dbee76
commit 9e4b940d8d
3 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Dec 8 18:31:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_pack): fixed length for odd length string.
[ruby-dev:37283]
Mon Dec 8 13:51:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_yield_0): Qundef means no argument. [ruby-Bugs-22525]

4
pack.c
View file

@ -609,7 +609,7 @@ pack_pack(ary, 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++) {
@ -640,7 +640,7 @@ pack_pack(ary, 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++) {

40
test/ruby/test_pack.rb
View file

@ -57,4 +57,44 @@ class TestPack < Test::Unit::TestCase
assert_raises(RangeError) { [0x80000000].pack("U") }
assert_raises(RangeError) { [0x100000000].pack("U") }
end
def test_pack_unpack_hH
assert_equal("\x01\xfe", ["10ef"].pack("h*"))
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"))
assert_equal(["1"], "\x01\xfe".unpack("h1"))
assert_equal(["10"], "\x01\xfe".unpack("h2"))
assert_equal(["10e"], "\x01\xfe".unpack("h3"))
assert_equal(["10ef"], "\x01\xfe".unpack("h4"))
assert_equal(["10ef"], "\x01\xfe".unpack("h5"))
assert_equal(["10ef"], "\x10\xef".unpack("H*"))
assert_equal([""], "\x10\xef".unpack("H0"))
assert_equal(["1"], "\x10\xef".unpack("H1"))
assert_equal(["10"], "\x10\xef".unpack("H2"))
assert_equal(["10e"], "\x10\xef".unpack("H3"))
assert_equal(["10ef"], "\x10\xef".unpack("H4"))
assert_equal(["10ef"], "\x10\xef".unpack("H5"))
end
end