msi: Uninitialized variable fix (Coverity)

James Hawkins truiken at gmail.com
Tue Sep 9 16:01:32 CDT 2008


On Tue, Sep 9, 2008 at 3:54 PM, Andrew Talbot
<andrew.talbot at talbotville.com> wrote:
> Fix for Coverity error CID: 762.
>
> ---
> Changelog:
>    msi: Uninitialized variable fix (Coverity).
>
> diff --git a/dlls/msi/action.c b/dlls/msi/action.c
> index 8a8efe7..48557f0 100644
> --- a/dlls/msi/action.c
> +++ b/dlls/msi/action.c
> @@ -3838,7 +3838,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
>     MSIFEATURE *feature;
>     UINT rc;
>     HKEY hkey;
> -    HKEY userdata;
> +    HKEY userdata = NULL;
>
>     if (!msi_check_publish(package))
>         return ERROR_SUCCESS;
> @@ -3952,7 +3952,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package)
>
>  end:
>     RegCloseKey(hkey);
> -    RegCloseKey(userdata);
> +    if (userdata) RegCloseKey(userdata);
>     return rc;

Please don't add another NULL-before-free check.

-- 
James Hawkins



More information about the wine-devel mailing list