From e70ad1897b9e4675e04033d7eb72dc16f2038e18 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 Jul 2010 04:06:12 +0000
Subject: merges r28577 from trunk into ruby_1_9_2. -- * string.c
 (rb_str_conv_enc_opts): fix infinite loop because   of ISO-2022-JP conversion
 with empty string.   patched by Brian Buchanan [ruby-core:31107]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 56dd36565c..f37abc8999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul  8 15:47:34 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+        * string.c (rb_str_conv_enc_opts): fix infinite loop because
+          of ISO-2022-JP conversion with empty string.
+          patched by Brian Buchanan [ruby-core:31107]
+
 Wed Jul  7 10:26:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* missing/close.c: ignore ECONNRESET.
-- 
cgit v1.2.3