Return an error in MsiGetComponentPathW if passed a null component.

8caef535 · Mike McCormack · Alexandre Julliard · 029c83d8 · 8caef535
Commit 8caef535 authored Oct 28, 2005 by Mike McCormack Committed by Alexandre Julliard Oct 28, 2005
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

msi.c dlls/msi/msi.c +3 -1

No files found.
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -418,7 +418,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer)
    DWORD sz = GUID_SIZE;
    static const WCHAR szPermKey[] =
        { '0','0','0','0','0','0','0','0','0','0','0','0',
-          '0','0','0','0','0','0','0', '0','0','0','0','0',
+          '0','0','0','0','0','0','0','0','0','0','0','0',
          '0','0','0','0','0','0','0','0',0};

    TRACE("%s %p\n",debugstr_w(szComponent), szBuffer);
@@ -1011,6 +1011,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent,
    TRACE("%s %s %p %p\n", debugstr_w(szProduct),
           debugstr_w(szComponent), lpPathBuf, pcchBuf);

+    if( !szComponent )
+        return INSTALLSTATE_INVALIDARG;
    if( lpPathBuf && !pcchBuf )
        return INSTALLSTATE_INVALIDARG;