diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-21 05:13:59 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-21 05:13:59 +0000 |
commit | 634779e62fac7154657cf73990fe7caafe1c2a21 (patch) | |
tree | 38dfc557e1c992da84d38f35d122b98b7b3dc76b /string.c | |
parent | 69d5f4ab53577fb4fb1a866ba74e5dbfe909e48d (diff) | |
download | ruby-634779e62fac7154657cf73990fe7caafe1c2a21.tar.gz |
string.c: potential memory leak
* string.c (rb_str_conv_enc_opts): allocate and hide wrapper before
creating converter to be wrapped, to get rid of potential memory
leak by failure on the allocation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -518,9 +518,10 @@ rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags, newstr = rb_str_new(0, len); olen = len; + econv_wrapper = rb_obj_alloc(rb_cEncodingConverter); + RBASIC(econv_wrapper)->klass = 0; ec = rb_econv_open_opts(from->name, to->name, ecflags, ecopts); if (!ec) return str; - econv_wrapper = rb_obj_alloc(rb_cEncodingConverter); DATA_PTR(econv_wrapper) = ec; sp = (unsigned char*)RSTRING_PTR(str); |