From 2b24ed556f43668d91a162b752a65f211e57559c Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Jun 2008 13:42:34 +0000
Subject: 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
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

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.
-- 
cgit v1.2.3