From 0945f41a5fbc0f935d9fc92cf7f60720563b2695 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 8 Dec 2008 14:41:44 +0000 Subject: * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. just ignores '*' in these cases. [ruby-dev:37289] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ pack.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 829e3e5fdc..37a16a91fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 8 23:34:18 2008 Yuki Sonoda (Yugui) + + * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. + just ignores '*' in these cases. + [ruby-dev:37289] + Mon Dec 8 18:31:41 2008 Nobuyoshi Nakada * pack.c (pack_pack): fixed length for odd length string. diff --git a/pack.c b/pack.c index f353d67c87..d910546a54 100644 --- a/pack.c +++ b/pack.c @@ -491,7 +491,9 @@ pack_pack(VALUE ary, VALUE fmt) } } if (*p == '*') { /* set data length */ - len = strchr("@Xxu", type) ? 0 : items; + len = strchr("@Xxu", type) ? 0 + : strchr("PMm", type) ? 1 + : items; p++; } else if (ISDIGIT(*p)) { -- cgit v1.2.3