Alexandre Julliard : ntdll:
Null-terminate strings returned by VFAT_IOCTL_READDIR_BOTH to work
around a kernel bug .
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 20 06:20:24 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 3f2da592ad4e7f113f59b7df435a51ef1721af12
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f2da592ad4e7f113f59b7df435a51ef1721af12
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jul 19 20:04:45 2006 +0200
ntdll: Null-terminate strings returned by VFAT_IOCTL_READDIR_BOTH to work around a kernel bug.
---
dlls/ntdll/directory.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 14a71b4..faeca6c 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -911,6 +911,9 @@ static int read_directory_vfat( int fd,
while (res != -1)
{
if (!de[0].d_reclen) break;
+ /* make sure names are null-terminated to work around an x86-64 kernel bug */
+ if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0;
+ if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0;
if (de[1].d_name[0])
info = append_entry( buffer, &io->Information, length,
de[1].d_name, de[0].d_name, mask );
@@ -942,6 +945,9 @@ static int read_directory_vfat( int fd,
while (res != -1)
{
if (!de[0].d_reclen) break;
+ /* make sure names are null-terminated to work around an x86-64 kernel bug */
+ if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0;
+ if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0;
if (de[1].d_name[0])
info = append_entry( buffer, &io->Information, length,
de[1].d_name, de[0].d_name, mask );
@@ -1247,6 +1253,9 @@ #ifdef VFAT_IOCTL_READDIR_BOTH
for (;;)
{
if (!de[0].d_reclen) break;
+ /* make sure names are null-terminated to work around an x86-64 kernel bug */
+ if (de[0].d_reclen < sizeof(de[0].d_name)) de[0].d_name[de[0].d_reclen] = 0;
+ if (de[1].d_reclen < sizeof(de[1].d_name)) de[1].d_name[de[1].d_reclen] = 0;
if (de[1].d_name[0])
{
More information about the wine-cvs
mailing list