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

potential memory leak

Browse source 
* 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
This commit is contained in:
nobu 2017-05-18 11:29:42 +00:00
parent 97e824136f
commit 92690b6235
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dir.c
View file

@ -1054,9 +1054,14 @@ rb_dir_getwd(void)
VALUE cwd; VALUE cwd;
rb_encoding *fs = rb_filesystem_encoding(); rb_encoding *fs = rb_filesystem_encoding();
int fsenc = rb_enc_to_index(fs); 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; if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII;
path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL);
path = my_getcwd(); path = my_getcwd();
DATA_PTR(path_guard) = path;
#ifdef _WIN32 #ifdef _WIN32
cwd = rb_str_conv_enc(rb_utf8_str_new_cstr(path), NULL, fs); cwd = rb_str_conv_enc(rb_utf8_str_new_cstr(path), NULL, fs);
#else #else
@ -1068,6 +1073,7 @@ rb_dir_getwd(void)
#endif #endif
rb_enc_associate_index(cwd, fsenc); rb_enc_associate_index(cwd, fsenc);
#endif #endif
DATA_PTR(path_guard) = 0;
xfree(path); xfree(path);
return cwd; return cwd;

8
util.c
View file

@ -511,7 +511,10 @@ ruby_getcwd(void)
char *buf = xmalloc(2); char *buf = xmalloc(2);
strcpy(buf, "."); strcpy(buf, ".");
#elif defined HAVE_GETCWD #elif defined HAVE_GETCWD
# undef RUBY_UNTYPED_DATA_WARNING
# define RUBY_UNTYPED_DATA_WARNING 0
# if defined NO_GETCWD_MALLOC # if defined NO_GETCWD_MALLOC
VALUE guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL);
int size = 200; int size = 200;
char *buf = xmalloc(size); char *buf = xmalloc(size);
@ -519,17 +522,22 @@ ruby_getcwd(void)
int e = errno; int e = errno;
if (e != ERANGE) { if (e != ERANGE) {
xfree(buf); xfree(buf);
DATA_PTR(guard) = NULL;
rb_syserr_fail(e, "getcwd"); rb_syserr_fail(e, "getcwd");
} }
size *= 2; size *= 2;
DATA_PTR(guard) = buf;
buf = xrealloc(buf, size); buf = xrealloc(buf, size);
} }
# else # else
VALUE guard = Data_Wrap_Struct((VALUE)0, NULL, free, NULL);
char *buf, *cwd = getcwd(NULL, 0); char *buf, *cwd = getcwd(NULL, 0);
DATA_PTR(guard) = cwd;
if (!cwd) rb_sys_fail("getcwd"); if (!cwd) rb_sys_fail("getcwd");
buf = ruby_strdup(cwd); /* allocate by xmalloc */ buf = ruby_strdup(cwd); /* allocate by xmalloc */
free(cwd); free(cwd);
# endif # endif
DATA_PTR(RB_GC_GUARD(guard)) = NULL;
#else #else
# ifndef PATH_MAX # ifndef PATH_MAX
# define PATH_MAX 8192 # define PATH_MAX 8192