msi: Don't leak the file handle on error in cabinet_close_file_info().

Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Don't leak the file handle on error in cabinet_close_file_info().
a0a800ab · Hans Leidekker · Alexandre Julliard · c8e28023 · a0a800ab
Commit a0a800ab authored Sep 13, 2021 by Hans Leidekker Committed by Alexandre Julliard Sep 13, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

media.c dlls/msi/media.c +10 -3

No files found.
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint,
    data->mi->is_continuous = FALSE;

    if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft))
+    {
+        CloseHandle(handle);
        return -1;
+    }
    if (!LocalFileTimeToFileTime(&ft, &ftLocal))
+    {
+        CloseHandle(handle);
        return -1;
+    }
    if (!SetFileTime(handle, &ftLocal, 0, &ftLocal))
+    {
+        CloseHandle(handle);
        return -1;
+    }

    CloseHandle(handle);
-
-    data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL,
-             data->user);
+    data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user);

    msi_free(data->curfile);
    data->curfile = NULL;