Skip to content

minizip: null-terminate the filename buffer when the stored name is truncated #1306

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
afonsojanu wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −1
Open

minizip: null-terminate the filename buffer when the stored name is truncated #1306

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
10 changes: 9 additions & 1 deletion contrib/minizip/unzip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,8 +859,16 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file,
*(szFileName+file_info.size_filename)='\0';
uSizeRead = file_info.size_filename;
}
else if (fileNameBufferSize>0)
{
/* stored name doesn't fit: keep one byte back so we can still
null-terminate inside the caller's buffer instead of filling
it completely and leaving callers to strlen() past the end */
uSizeRead = fileNameBufferSize-1;
*(szFileName+uSizeRead)='\0';
}
else
uSizeRead = fileNameBufferSize;
uSizeRead = 0;

if ((file_info.size_filename>0) && (fileNameBufferSize>0))
if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
Expand Down