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_6@22448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-19 09:01:35 +00:00
parent d7f2704848
commit aa98314cd1
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
Thu Feb 19 17:52:42 2009 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]
Thu Feb 19 17:24:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_pack): fixed length for odd length string.

4
pack.c
View File

@ -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)) {

View File

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-19"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090219
#define RUBY_PATCHLEVEL 342
#define RUBY_PATCHLEVEL 343
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8