summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:42:34 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:42:34 +0000
commit2b24ed556f43668d91a162b752a65f211e57559c (patch)
tree278bfb6c88294f977e8d08e0aa698b83b274697c /ChangeLog
parent485521dfb11fae64081679e10db0e7523e32591b (diff)
merge revision(s) 16305:
* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop. a patch from Kouya <kouyataifu4 at gmail.com> in [ruby-reference-manual:762]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b26070c630..451f9d1700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 22:41:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
+ a patch from Kouya <kouyataifu4 at gmail.com> in
+ [ruby-reference-manual:762].
+
Sun Jun 15 22:32:39 2008 James Edward Gray II <jeg2@ruby-lang.org>
Merged 16241 from trunk.