mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 20:03:12 +00:00
RtlGetFullPathName_U() is supposed to check the parameter buf, it could be NULL
svn path=/trunk/; revision=8695
This commit is contained in:
parent
1bc3d1b4ed
commit
ea0774aba3
1 changed files with 11 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: path.c,v 1.26 2003/11/30 20:48:07 gdalsnes Exp $
|
/* $Id: path.c,v 1.27 2004/03/13 22:23:14 weiden 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
|
||||||
|
@ -575,7 +575,8 @@ RtlGetFullPathName_U(PWSTR DosName,
|
||||||
len--;
|
len--;
|
||||||
if (FilePart)
|
if (FilePart)
|
||||||
*FilePart = NULL;
|
*FilePart = NULL;
|
||||||
*buf = 0;
|
if (buf)
|
||||||
|
*buf = 0;
|
||||||
|
|
||||||
CHECKPOINT;
|
CHECKPOINT;
|
||||||
/* check for DOS device name */
|
/* check for DOS device name */
|
||||||
|
@ -586,8 +587,11 @@ CHECKPOINT;
|
||||||
sz &= 0x0000FFFF;
|
sz &= 0x0000FFFF;
|
||||||
if (sz + 8 >= size)
|
if (sz + 8 >= size)
|
||||||
return sz + 10;
|
return sz + 10;
|
||||||
wcscpy (buf, L"\\\\.\\");
|
if (buf)
|
||||||
wcsncat (buf, DosName + offs, sz / sizeof(WCHAR));
|
{
|
||||||
|
wcscpy (buf, L"\\\\.\\");
|
||||||
|
wcsncat (buf, DosName + offs, sz / sizeof(WCHAR));
|
||||||
|
}
|
||||||
return sz + 8;
|
return sz + 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -721,10 +725,11 @@ CHECKPOINT;
|
||||||
|
|
||||||
if (len < (size / sizeof(WCHAR)))
|
if (len < (size / sizeof(WCHAR)))
|
||||||
{
|
{
|
||||||
memcpy (buf, TempFullPathName, (len + 1) * sizeof(WCHAR));
|
if (buf)
|
||||||
|
memcpy (buf, TempFullPathName, (len + 1) * sizeof(WCHAR));
|
||||||
|
|
||||||
/* find file part */
|
/* find file part */
|
||||||
if (FilePart)
|
if (FilePart && buf)
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
*FilePart = wcsrchr(buf, L'\\');
|
*FilePart = wcsrchr(buf, L'\\');
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue