msi: Treat an empty install location as missing.

b98ef8f0 · Hans Leidekker · Alexandre Julliard · 6a7bf66b · b98ef8f0
Commit b98ef8f0 authored May 07, 2013 by Hans Leidekker Committed by Alexandre Julliard May 07, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

action.c dlls/msi/action.c +6 -3

No files found.
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2305,9 +2305,12 @@ static WCHAR *get_install_location( MSIPACKAGE *package )
    WCHAR *path;

    if (!package->ProductCode) return NULL;
-    if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE ))
-        return NULL;
-    path = msi_reg_get_val_str( hkey, szInstallLocation );
+    if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) return NULL;
+    if ((path = msi_reg_get_val_str( hkey, szInstallLocation )) && !path[0])
+    {
+        msi_free( path );
+        path = NULL;
+    }
    RegCloseKey( hkey );
    return path;
 }