summaryrefslogtreecommitdiff
path: root/pack.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-20 13:22:32 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-20 13:22:32 +0000
commit139ab718de87af8ca9a3c83da9ca4f59c9cdb7e8 (patch)
tree96187af972cf192cff805bfeae67f9f936a69f5a /pack.c
parent79128855ab1c2cae7fe95b60f89e7bd176f02cc8 (diff)
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
Diffstat (limited to 'pack.c')
-rw-r--r--pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pack.c b/pack.c
index be42c6293e..d659266a41 100644
--- a/pack.c
+++ b/pack.c
@@ -1189,7 +1189,7 @@ hex2num(char c)
} while (0)
#define PACK_ITEM_ADJUST() do { \
- if (tmp_len > 0) \
+ if (tmp_len > 0 && !block_p) \
rb_ary_store(ary, RARRAY_LEN(ary)+tmp_len-1, Qnil); \
} while (0)