From 3a6fd339d54dc9b11a137567d6b1aefe5f3ec53d Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Jul 2010 08:18:07 +0000
Subject: * 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/trunk@28577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'string.c')

diff --git a/string.c b/string.c
index 8cfbb56bdf..1b06370bb7 100644
--- a/string.c
+++ b/string.c
@@ -513,7 +513,7 @@ rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags,
     switch (ret) {
       case econv_destination_buffer_full:
 	/* destination buffer short */
-	len *= 2;
+	len = len < 2 ? 2 : len * 2;
 	rb_str_resize(newstr, len);
 	goto retry;
 
-- 
cgit v1.2.3