Make sure not to access invalid components or features.

cbb5709a · Mike McCormack · Alexandre Julliard · 9dc4921e · cbb5709a
Commit cbb5709a authored Sep 12, 2005 by Mike McCormack Committed by Alexandre Julliard Sep 12, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

helpers.c dlls/msi/helpers.c +6 -0

No files found.
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -772,6 +772,9 @@ void ui_actiondata(MSIPACKAGE *package, LPCWSTR action, MSIRECORD * record)
 BOOL ACTION_VerifyComponentForAction(MSIPACKAGE* package, MSICOMPONENT* comp,
                                            INSTALLSTATE check )
 {
+    if (!comp)
+        return FALSE;
+
    if (comp->Installed == check)
        return FALSE;

@@ -783,6 +786,9 @@ BOOL ACTION_VerifyComponentForAction(MSIPACKAGE* package, MSICOMPONENT* comp,

 BOOL ACTION_VerifyFeatureForAction( MSIFEATURE* feature, INSTALLSTATE check )
 {
+    if (!feature)
+        return FALSE;
+
    if (feature->Installed == check)
        return FALSE;