merges r20581 from trunk into ruby_1_9_1.

* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
  just ignores '*' in these cases.
  [ruby-dev:37289]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 1 deletions

diff --git a/pack.c b/pack.c
index 3f20d53c5..8c02f6256 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)) {