Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 22:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SETUPAPI]

Browse source 
Fix invalid use of wcslen with NULL pointer. Should fix crash in setupapi_winetest:install.

svn path=/trunk/; revision=70441
This commit is contained in:
Timo Kreuzer 2015-12-27 17:55:14 +00:00
parent 4b7f7b68f1
commit 97f52680ef
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/setupapi/install.c
View file

@ -1079,7 +1079,9 @@ profile_items_callback(
hr = IShellLinkW_QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf);
if (SUCCEEDED(hr))
{
Required = (MAX_PATH + wcslen(LinkSubDir) + 1 + wcslen(LinkName)) * sizeof(WCHAR);
Required = (MAX_PATH + 1 +
((LinkSubDir != NULL) ? wcslen(LinkSubDir) : 0) +
((LinkName != NULL) ? wcslen(LinkName) : 0)) * sizeof(WCHAR);
FullLinkName = MyMalloc(Required);
if (!FullLinkName)
hr = E_OUTOFMEMORY;
@ -1812,7 +1814,7 @@ static BOOL InstallOneService(
if (!GetLineText(hInf, ServiceSection, ServiceBinaryKey, &ServiceBinary))
{
SetLastError( ERROR_BAD_SERVICE_INSTALLSECT );
SetLastError( ERROR_BAD_SERVICE_INSTALLSECT );
goto cleanup;
}