unzOpen2_64() when it fails keeps file handle open

Using unzOpen2_64() with fill_win32_filefunc64() on a file that is not a Zip file causes the file to stay opened. Another process cannot delete the file. The problem is likely with fill_win32_filefunc64().

The issue is on Windows 10.

zlib_filefunc64_def ffunc;
fill_win32_filefunc64(&ffunc);
auto uzf = unzOpen2_64(path.c_str(), &ffunc);
if (uzf == nullptr) {
   return false; // The file handle to path is still open!
}

I think the fix is just a single line of code:

unzFile unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_filefunc_def)
{
    unzFile unz = NULL;
    void *stream = NULL;

    if (pzlib_filefunc_def)
    {
        if (mz_stream_create(&stream, (mz_stream_vtbl *)*pzlib_filefunc_def) == NULL)
            return NULL;
    }
    else
    {
        if (mz_stream_os_create(&stream) == NULL)
            return NULL;
    }

    if (mz_stream_open(stream, path, MZ_OPEN_MODE_READ) != MZ_OK)
    {
        mz_stream_delete(&stream);
        return NULL;
    }

    unz = unzOpen_MZ(stream);
    if (unz == NULL)
    {
        mz_stream_close(stream); // <-- this needs to be added
        mz_stream_delete(&stream);
        return NULL;
    }
    return unz;
}

Thank you for reporting the issue. The fix looks good, do you want to create a PR?

Fix zlib-ng#461: unzOpen2_64() when it fails keeps file handle open

Okay, done. From: Nathan Moinvaziri <notifications@github.com> Reply-To: nmoinvaz/minizip <reply@reply.github.com> Date: Friday, April 3, 2020 at 1:28 PM To: nmoinvaz/minizip <minizip@noreply.github.com> Cc: "jim@scratchpaper.com" <jim@scratchpaper.com>, Author <author@noreply.github.com> Subject: Re: [nmoinvaz/minizip] unzOpen2_64() when it fails keeps file handle open (#461) Thank you for reporting the issue. The fix looks good, do you want to create a PR? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#461 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AAJQTKSPPCVFRCT4DDZNMUDRKYMCDANCNFSM4L4IIAYA>.

Merge pull request #462 from jimpark/dev

Thanks!

Navigation Menu

Repository navigation

unzOpen2_64() when it fails keeps file handle open #461

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

unzOpen2_64() when it fails keeps file handle open #461

Description

Activity

jimpark commented on Apr 3, 2020

nmoinvaz commented on Apr 3, 2020

jimpark commented on Apr 3, 2020

nmoinvaz commented on Apr 4, 2020

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions