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

win32/file.c: fix free

Browse source 
* win32/file.c (rb_file_expand_path_internal): should free wpath,
  but not xfree, corresponding to rb_w32_mbstr_to_wstr which
  allocates by malloc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-04-10 07:30:42 +00:00
parent 997df3ad01
commit 75dc429f3e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32/file.c
View file

@ -375,13 +375,13 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
whome = home_dir(); whome = home_dir();
if (whome == NULL) { if (whome == NULL) {
xfree(wpath); free(wpath);
rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'"); rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
} }
whome_len = wcslen(whome); whome_len = wcslen(whome);
if (PathIsRelativeW(whome) && !(whome_len >= 2 && IS_DIR_UNC_P(whome))) { if (PathIsRelativeW(whome) && !(whome_len >= 2 && IS_DIR_UNC_P(whome))) {
xfree(wpath); free(wpath);
xfree(whome); xfree(whome);
rb_raise(rb_eArgError, "non-absolute home"); rb_raise(rb_eArgError, "non-absolute home");
} }
@ -423,7 +423,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
cp, path_cp, path_encoding); cp, path_cp, path_encoding);
if (wpath) if (wpath)
xfree(wpath); free(wpath);
rb_exc_raise(rb_exc_new_str(rb_eArgError, result)); rb_exc_raise(rb_exc_new_str(rb_eArgError, result));
} }
@ -440,7 +440,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
const long dir_len = RSTRING_LEN(dir); const long dir_len = RSTRING_LEN(dir);
#if SIZEOF_INT < SIZEOF_LONG #if SIZEOF_INT < SIZEOF_LONG
if ((long)(int)dir_len != dir_len) { if ((long)(int)dir_len != dir_len) {
if (wpath) xfree(wpath); if (wpath) free(wpath);
rb_raise(rb_eRangeError, "base directory (%ld bytes) is too long", rb_raise(rb_eRangeError, "base directory (%ld bytes) is too long",
dir_len); dir_len);
} }