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 reallocation threshold

Browse source 
* win32/file.c (replace_to_long_name): fix reallocation threshold.
  dereferenced size of a pointer is not same as the buffer size.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-04-28 06:54:05 +00:00
parent 1e775c18e5
commit 9ef7c87d67
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
win32/file.c
View file

@ -214,7 +214,7 @@ code_page(rb_encoding *enc)
We try to avoid to call FindFirstFileW() since it takes long time. We try to avoid to call FindFirstFileW() since it takes long time.
*/ */
static inline size_t static inline size_t
replace_to_long_name(wchar_t **wfullpath, size_t size, int heap) replace_to_long_name(wchar_t **wfullpath, size_t size, size_t buffer_size)
{ {
WIN32_FIND_DATAW find_data; WIN32_FIND_DATAW find_data;
HANDLE find_handle; HANDLE find_handle;
@ -259,13 +259,14 @@ replace_to_long_name(wchar_t **wfullpath, size_t size, int heap)
if (find_handle != INVALID_HANDLE_VALUE) { if (find_handle != INVALID_HANDLE_VALUE) {
size_t trail_pos = pos - *wfullpath + IS_DIR_SEPARATOR_P(*pos); size_t trail_pos = pos - *wfullpath + IS_DIR_SEPARATOR_P(*pos);
size_t file_len = wcslen(find_data.cFileName); size_t file_len = wcslen(find_data.cFileName);
size_t oldsize = size;
FindClose(find_handle); FindClose(find_handle);
size = trail_pos + file_len; size = trail_pos + file_len;
if ((size + 1) > sizeof(*wfullpath) / sizeof((*wfullpath)[0])) { if (size > (buffer_size ? buffer_size-1 : oldsize)) {
wchar_t *buf = (wchar_t *)xmalloc((size + 1) * sizeof(wchar_t)); wchar_t *buf = (wchar_t *)xmalloc((size + 1) * sizeof(wchar_t));
wcsncpy(buf, *wfullpath, trail_pos); wcsncpy(buf, *wfullpath, trail_pos);
if (heap) if (!buffer_size)
xfree(*wfullpath); xfree(*wfullpath);
*wfullpath = buf; *wfullpath = buf;
} }
@ -616,8 +617,10 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
size = remove_invalid_alternative_data(wfullpath, size); size = remove_invalid_alternative_data(wfullpath, size);
/* Replace the trailing path to long name */ /* Replace the trailing path to long name */
if (long_name) if (long_name) {
size = replace_to_long_name(&wfullpath, size, (wfullpath != wfullpath_buffer)); size_t bufsize = wfullpath == wfullpath_buffer ? PATH_BUFFER_SIZE : 0;
size = replace_to_long_name(&wfullpath, size, bufsize);
}
/* sanitize backslashes with forwardslashes */ /* sanitize backslashes with forwardslashes */
replace_wchar(wfullpath, L'\\', L'/'); replace_wchar(wfullpath, L'\\', L'/');