1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/win32.c (rb_w32_read_reparse_point): return correct required

Browse Source 
buffer size for IO_REPARSE_TAG_MOUNT_POINT.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-09-08 03:06:10 +00:00
parent 161cee3c48
commit 49cbfc8359
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Sep 8 12:05:00 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_read_reparse_point): return correct required
buffer size for IO_REPARSE_TAG_MOUNT_POINT.
Tue Sep 8 00:14:43 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Sep 8 00:14:43 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (rb_execarg_parent_start1): raise with the target path * process.c (rb_execarg_parent_start1): raise with the target path

9
win32/win32.c
View File

@ -4777,7 +4777,7 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp,
size_t bufsize, WCHAR **result, DWORD *len) size_t bufsize, WCHAR **result, DWORD *len)
{ {
int e = reparse_symlink(path, rp, bufsize); int e = reparse_symlink(path, rp, bufsize);
DWORD ret; DWORD ret = 0;
if (!e || e == ERROR_MORE_DATA) { if (!e || e == ERROR_MORE_DATA) {
void *name; void *name;
@ -4785,17 +4785,18 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp,
name = ((char *)rp->SymbolicLinkReparseBuffer.PathBuffer + name = ((char *)rp->SymbolicLinkReparseBuffer.PathBuffer +
rp->SymbolicLinkReparseBuffer.PrintNameOffset); rp->SymbolicLinkReparseBuffer.PrintNameOffset);
ret = rp->SymbolicLinkReparseBuffer.PrintNameLength; ret = rp->SymbolicLinkReparseBuffer.PrintNameLength;
*len = ret / sizeof(WCHAR);
} }
else { /* IO_REPARSE_TAG_MOUNT_POINT */ else { /* IO_REPARSE_TAG_MOUNT_POINT */
/* +4/-4 means to drop "\??\" */ /* +4/-4 means to drop "\??\" */
name = ((char *)rp->MountPointReparseBuffer.PathBuffer + name = ((char *)rp->MountPointReparseBuffer.PathBuffer +
rp->MountPointReparseBuffer.SubstituteNameOffset + rp->MountPointReparseBuffer.SubstituteNameOffset +
4 * sizeof(WCHAR)); 4 * sizeof(WCHAR));
ret = rp->MountPointReparseBuffer.SubstituteNameLength - ret = rp->MountPointReparseBuffer.SubstituteNameLength;
4 * sizeof(WCHAR); *len = ret / sizeof(WCHAR);
ret -= 4 * sizeof(WCHAR);
} }
*result = name; *result = name;
*len = ret / sizeof(WCHAR);
if (e) { if (e) {
if ((char *)name + ret + sizeof(WCHAR) > (char *)rp + bufsize) if ((char *)name + ret + sizeof(WCHAR) > (char *)rp + bufsize)
return e; return e;