summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--pack.c4
-rw-r--r--version.h2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 355fddd1f0..301e341a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/pack.c b/pack.c
index 13c282af9a..08f72465f8 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 b17b5919a6..69fefa0fc2 100644
--- a/version.h
+++ b/version.h
@@ -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