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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f94a912829..0297287b00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  8 23:34:18 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* 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  <nobu@ruby-lang.org>
 
 	* pack.c (pack_pack): fixed length for odd length string.
diff --git a/pack.c b/pack.c
index 3f20d53c58..8c02f62563 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)) {