merges r29804 from trunk into ruby_1_9_2.

--
* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
  values if block is given.  [ruby-core:33193]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 0 deletions

diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb
index a4a6308299..8fa0a90915 100644
--- a/test/ruby/test_pack.rb
+++ b/test/ruby/test_pack.rb
@@ -615,4 +615,11 @@ class TestPack < Test::Unit::TestCase
       assert_equal([1,nil], str.unpack("#{fmt}2"))
     }
   end
+
+  def test_short_with_block
+    bug4059 = '[ruby-core:33193]'
+    result = :ok
+    assert_nil("".unpack("i") {|x| result = x}, bug4059)
+    assert_equal(:ok, result)
+  end
 end