Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 02:11:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Do not depend on paths returned by FileNameInformation requests to be NULL terminated.

Browse source 
svn path=/trunk/; revision=10677
This commit is contained in:
Filip Navara 2004-08-25 15:04:19 +00:00
parent e877ccfb63
commit b8648c7bf4
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/lib/ntdll/rtl/path.c
View file

@ -1,4 +1,4 @@
/* $Id: path.c,v 1.28 2004/05/13 21:01:14 navaraf Exp $ /* $Id: path.c,v 1.29 2004/08/25 15:04:19 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -373,7 +373,7 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING name)
PWSTR buf = 0; PWSTR buf = 0;
PFILE_NAME_INFORMATION filenameinfo; PFILE_NAME_INFORMATION filenameinfo;
ULONG backslashcount = 0; ULONG backslashcount = 0;
PWSTR cntr; ULONG Index;
WCHAR var[4]; WCHAR var[4];
DPRINT ("RtlSetCurrentDirectory %wZ\n", name); DPRINT ("RtlSetCurrentDirectory %wZ\n", name);
@ -461,7 +461,8 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING name)
return(Status); return(Status);
} }
if (filenameinfo->FileName[1]) // If it's just "\", we need special handling /* If it's just "\", we need special handling */
if (filenameinfo->FileNameLength > sizeof(WCHAR))
{ {
wcs = buf + size / sizeof(WCHAR) - 1; wcs = buf + size / sizeof(WCHAR) - 1;
if (*wcs == L'\\') if (*wcs == L'\\')
@ -471,9 +472,11 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING name)
size -= sizeof(WCHAR); size -= sizeof(WCHAR);
} }
for (cntr=filenameinfo->FileName;*cntr!=0;cntr++) for (Index = 0;
Index < filenameinfo->FileNameLength / sizeof(WCHAR);
Index++)
{ {
if (*cntr=='\\') backslashcount++; if (filenameinfo->FileName[Index] == '\\') backslashcount++;
} }
DPRINT("%d \n",backslashcount); DPRINT("%d \n",backslashcount);
@ -483,9 +486,10 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING name)
} }
wcs++; wcs++;
wcscpy(wcs,filenameinfo->FileName); RtlCopyMemory(wcs, filenameinfo->FileName, filenameinfo->FileNameLength);
wcs[filenameinfo->FileNameLength / sizeof(WCHAR)] = 0;
size=((wcs-buf)+wcslen(filenameinfo->FileName))*sizeof(WCHAR); size = (wcs - buf) * sizeof(WCHAR) + filenameinfo->FileNameLength;
} }
RtlFreeHeap (RtlGetProcessHeap (), RtlFreeHeap (RtlGetProcessHeap (),