From 619450c2d76fbd745268a2afb8c5102d73545f2a Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 19 Feb 2009 09:02:43 +0000 Subject: merge revision(s) 20581: * 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_8_7@22450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ pack.c | 4 +++- version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91f77818f1..5a8c3f1376 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 19 18:02:10 2009 Yuki Sonoda (Yugui) + + * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'. + just ignores '*' in these cases. + [ruby-dev:37289] + Thu Feb 19 17:26:11 2009 Nobuyoshi Nakada * pack.c (pack_pack): fixed length for odd length string. diff --git a/pack.c b/pack.c index d0fdd75cd5..7a04673309 100644 --- a/pack.c +++ b/pack.c @@ -494,7 +494,9 @@ pack_pack(ary, 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)) { diff --git a/version.h b/version.h index 254605be27..fa2cc4513e 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-19" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090219 -#define RUBY_PATCHLEVEL 129 +#define RUBY_PATCHLEVEL 130 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3