Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

report proper buffer sizes as documented

Browse source 
svn path=/trunk/; revision=11701
This commit is contained in:
Thomas Bluemel 2004-11-19 20:02:47 +00:00
parent b260dfd4b0
commit 7857b6c7e9
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/lib/userenv/profile.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: profile.c,v 1.16 2004/11/08 21:23:34 weiden Exp $ /* $Id: profile.c,v 1.17 2004/11/19 20:02:47 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
@ -351,7 +351,7 @@ GetAllUsersProfileDirectoryW (LPWSTR lpProfileDir,
} }
/* Get profiles path */ /* Get profiles path */
dwLength = MAX_PATH * sizeof(WCHAR); dwLength = sizeof(szBuffer);
if (RegQueryValueExW (hKey, if (RegQueryValueExW (hKey,
L"ProfilesDirectory", L"ProfilesDirectory",
NULL, NULL,
@ -375,7 +375,7 @@ GetAllUsersProfileDirectoryW (LPWSTR lpProfileDir,
} }
/* Get 'AllUsersProfile' name */ /* Get 'AllUsersProfile' name */
dwLength = MAX_PATH * sizeof(WCHAR); dwLength = sizeof(szBuffer);
if (RegQueryValueExW (hKey, if (RegQueryValueExW (hKey,
L"AllUsersProfile", L"AllUsersProfile",
NULL, NULL,
@ -393,7 +393,7 @@ GetAllUsersProfileDirectoryW (LPWSTR lpProfileDir,
wcscat (szProfilePath, L"\\"); wcscat (szProfilePath, L"\\");
wcscat (szProfilePath, szBuffer); wcscat (szProfilePath, szBuffer);
dwLength = wcslen (szProfilePath); dwLength = wcslen (szProfilePath) + 1;
if (lpProfileDir != NULL) if (lpProfileDir != NULL)
{ {
if (*lpcchSize < dwLength) if (*lpcchSize < dwLength)
@ -464,7 +464,7 @@ GetDefaultUserProfileDirectoryW (LPWSTR lpProfileDir,
} }
/* Get profiles path */ /* Get profiles path */
dwLength = MAX_PATH * sizeof(WCHAR); dwLength = sizeof(szBuffer);
if (RegQueryValueExW (hKey, if (RegQueryValueExW (hKey,
L"ProfilesDirectory", L"ProfilesDirectory",
NULL, NULL,
@ -488,7 +488,7 @@ GetDefaultUserProfileDirectoryW (LPWSTR lpProfileDir,
} }
/* Get 'DefaultUserProfile' name */ /* Get 'DefaultUserProfile' name */
dwLength = MAX_PATH * sizeof(WCHAR); dwLength = sizeof(szBuffer);
if (RegQueryValueExW (hKey, if (RegQueryValueExW (hKey,
L"DefaultUserProfile", L"DefaultUserProfile",
NULL, NULL,
@ -506,7 +506,7 @@ GetDefaultUserProfileDirectoryW (LPWSTR lpProfileDir,
wcscat (szProfilePath, L"\\"); wcscat (szProfilePath, L"\\");
wcscat (szProfilePath, szBuffer); wcscat (szProfilePath, szBuffer);
dwLength = wcslen (szProfilePath); dwLength = wcslen (szProfilePath) + 1;
if (lpProfileDir != NULL) if (lpProfileDir != NULL)
{ {
if (*lpcchSize < dwLength) if (*lpcchSize < dwLength)
@ -577,7 +577,7 @@ GetProfilesDirectoryW (LPWSTR lpProfilesDir,
} }
/* Get profiles path */ /* Get profiles path */
dwLength = MAX_PATH * sizeof(WCHAR); dwLength = sizeof(szBuffer);
if (RegQueryValueExW (hKey, if (RegQueryValueExW (hKey,
L"ProfilesDirectory", L"ProfilesDirectory",
NULL, NULL,
@ -601,12 +601,12 @@ GetProfilesDirectoryW (LPWSTR lpProfilesDir,
return FALSE; return FALSE;
} }
dwLength = wcslen (szProfilesPath); dwLength = wcslen (szProfilesPath) + 1;
if (lpProfilesDir != NULL) if (lpProfilesDir != NULL)
{ {
if (*lpcchSize < dwLength / sizeof(WCHAR)) if (*lpcchSize < dwLength)
{ {
*lpcchSize = dwLength / sizeof(WCHAR); *lpcchSize = dwLength;
SetLastError (ERROR_INSUFFICIENT_BUFFER); SetLastError (ERROR_INSUFFICIENT_BUFFER);
return FALSE; return FALSE;
} }
@ -694,7 +694,7 @@ GetUserProfileDirectoryW (HANDLE hToken,
return FALSE; return FALSE;
} }
dwLength = MAX_PATH * sizeof(WCHAR); dwLength = sizeof(szRawImagePath);
if (RegQueryValueExW (hKey, if (RegQueryValueExW (hKey,
L"ProfileImagePath", L"ProfileImagePath",
NULL, NULL,
@ -722,8 +722,8 @@ GetUserProfileDirectoryW (HANDLE hToken,
DPRINT ("ImagePath: '%S'\n", szImagePath); DPRINT ("ImagePath: '%S'\n", szImagePath);
dwLength = wcslen (szImagePath); dwLength = wcslen (szImagePath) + 1;
if (dwLength > *lpcchSize) if (*lpcchSize < dwLength)
{ {
DPRINT1 ("Buffer too small\n"); DPRINT1 ("Buffer too small\n");
SetLastError (ERROR_INSUFFICIENT_BUFFER); SetLastError (ERROR_INSUFFICIENT_BUFFER);