Skip to content

minizip: fix heap-buffer-overflow in zipRemoveExtraInfoBlock #1280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nakata-app wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −0
Open

minizip: fix heap-buffer-overflow in zipRemoveExtraInfoBlock #1280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions contrib/minizip/zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2212,9 +2212,21 @@ extern int ZEXPORT zipRemoveExtraInfoBlock(char* pData, int* dataLen, short sHea

while(p < (pData + *dataLen))
{
if ((pData + *dataLen) - p < 4)
{
free(pNewHeader);
return ZIP_PARAMERROR;
}

header = *(short*)p;
dataSize = *(((short*)p)+1);

if (dataSize < 0 || dataSize + 4 > (pData + *dataLen) - p)
{
free(pNewHeader);
return ZIP_PARAMERROR;
}

if( header == sHeader ) /* Header found. */
{
p += dataSize + 4; /* skip it. do not copy to temp buffer */
Expand Down