kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r28577 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-07-10 04:06:12 +00:00
parent f813b7dc1a
commit e70ad1897b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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.

2
string.c
View file

@ -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;