diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-18 11:29:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-18 11:29:42 +0000 |
commit | fe8bc6485e6646d24a5b19460b7366250c9287c0 (patch) | |
tree | eac737d60bf719ebad4f54dd3b0f3faca9cad8a0 /dir.c | |
parent | d484f5d2238f0edd14b0b5281f3de88cb4466426 (diff) | |
download | ruby-fe8bc6485e6646d24a5b19460b7366250c9287c0.tar.gz |
potential memory leak
* dir.c (rb_dir_getwd): get rid of potential memory leak.
* util.c (ruby_getcwd): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1054,9 +1054,14 @@ rb_dir_getwd(void) VALUE cwd; rb_encoding *fs = rb_filesystem_encoding(); int fsenc = rb_enc_to_index(fs); + VALUE path_guard; +#undef RUBY_UNTYPED_DATA_WARNING +#define RUBY_UNTYPED_DATA_WARNING 0 if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII; + path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL); path = my_getcwd(); + DATA_PTR(path_guard) = path; #ifdef _WIN32 cwd = rb_str_conv_enc(rb_utf8_str_new_cstr(path), NULL, fs); #else @@ -1068,6 +1073,7 @@ rb_dir_getwd(void) #endif rb_enc_associate_index(cwd, fsenc); #endif + DATA_PTR(path_guard) = 0; xfree(path); return cwd; |