[SETUPAPI]

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

svn path=/trunk/; revision=70441

diff --git a/reactos/dll/win32/setupapi/install.c b/reactos/dll/win32/setupapi/install.c
index 28f0f37..bfa6767 100644 (file)
--- a/reactos/dll/win32/setupapi/install.c
+++ b/reactos/dll/win32/setupapi/install.c
@@ -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;
     }