summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-01-05 15:24:13 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-01-05 15:24:13 +0000
commit025a7e004c9fe941e0ce0d73a8b3aa4d487a637e (patch)
tree22b65fd52d76145e3e215e42860dbc6770df9cae
parentebaffbd6e86c7d8524b39e0cc86bd23efbfa799e (diff)
downloadruby-025a7e004c9fe941e0ce0d73a8b3aa4d487a637e.tar.gz
ruby-025a7e004c9fe941e0ce0d73a8b3aa4d487a637e.tar.xz
ruby-025a7e004c9fe941e0ce0d73a8b3aa4d487a637e.zip
eban
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--pack.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a5847e45..46aaa622a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 6 00:17:18 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * pack.c (pack_pack): avoid infinite loop(pack 'm2').
+
Sat Dec 30 03:14:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_iterate): NODE_CFUNC does not protect its data
diff --git a/pack.c b/pack.c
index a6e4b08a1..975081cca 100644
--- a/pack.c
+++ b/pack.c
@@ -826,7 +826,7 @@ pack_pack(ary, fmt)
case 'm':
ptr = rb_str2cstr(NEXTFROM, &plen);
- if (len <= 1)
+ if (len <= 2)
len = 45;
else
len = len / 3 * 3;