c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move extrafield parameters to end of structure.

Browse Source 
Don't use HAVE_WZAES, because another app or library might be using mz.h on which doesn't have HAVE_WZAES defined.
Return MZ_SUPPORT_ERROR if aes_version set, but HAVE_WZAES not defined.
Fixed some LGTM alerts. #349
This commit is contained in:
Nathan Moinvaziri 2018-11-27 09:45:09 -08:00
parent 9e9d0299f1
commit f9e344888f
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mz_zip.c
View File

@ -193,8 +193,8 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
uint16_t ntfs_attrib_size = 0;
uint16_t value16 = 0;
uint32_t value32 = 0;
int64_t extrafield_pos = -1;
int64_t comment_pos = -1;
int64_t extrafield_pos = 0;
int64_t comment_pos = 0;
int32_t err = MZ_OK;
@ -271,13 +271,13 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
if ((err == MZ_OK) && (file_info->filename_size > 0))
err = mz_stream_copy(file_extra_stream, stream, file_info->filename_size);
mz_stream_write_uint8(file_extra_stream, 0);
extrafield_pos = (int64_t)file_info->filename_size + 1;
extrafield_pos = mz_stream_tell(file_extra_stream);
if ((err == MZ_OK) && (file_info->extrafield_size > 0))
err = mz_stream_copy(file_extra_stream, stream, file_info->extrafield_size);
mz_stream_write_uint8(file_extra_stream, 0);
comment_pos = extrafield_pos + (int64_t)file_info->extrafield_size + 1;
comment_pos = mz_stream_tell(file_extra_stream);
if ((err == MZ_OK) && (file_info->comment_size > 0))
err = mz_stream_copy(file_extra_stream, stream, file_info->comment_size);
mz_stream_write_uint8(file_extra_stream, 0);
@ -426,10 +426,8 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
/* Get pointers to variable length data */
mz_stream_mem_get_buffer(file_extra_stream, (const void **)&file_info->filename);
if (extrafield_pos >= 0)
mz_stream_mem_get_buffer_at(file_extra_stream, extrafield_pos, (const void **)&file_info->extrafield);
if (comment_pos >= 0)
mz_stream_mem_get_buffer_at(file_extra_stream, comment_pos, (const void **)&file_info->comment);
mz_stream_mem_get_buffer_at(file_extra_stream, extrafield_pos, (const void **)&file_info->extrafield);
mz_stream_mem_get_buffer_at(file_extra_stream, comment_pos, (const void **)&file_info->comment);
/* Set to empty string just in-case */
if (file_info->filename == NULL)
@ -1579,6 +1577,11 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
return MZ_SUPPORT_ERROR;
}
#ifndef HAVE_WZAES
if (zip->file_info.aes_version)
return MZ_SUPPORT_ERROR;
#endif
zip->entry_raw = raw;
if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password != NULL))
@ -1749,7 +1752,7 @@ int32_t mz_zip_entry_read_open(void *handle, uint8_t raw, const char *password)
#if defined(MZ_ZIP_NO_ENCRYPTION)
if (password != NULL)
return MZ_PARAM_ERROR;
return MZ_SUPPORT_ERROR;
#endif
if (zip == NULL)
return MZ_PARAM_ERROR;
@ -1793,15 +1796,15 @@ int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info, int1
{
mz_zip *zip = (mz_zip *)handle;
int64_t filename_pos = -1;
int64_t extrafield_pos = -1;
int64_t comment_pos = -1;
int64_t extrafield_pos = 0;
int64_t comment_pos = 0;
int64_t disk_number = 0;
uint8_t is_dir = 0;
int32_t err = MZ_OK;
#if defined(MZ_ZIP_NO_ENCRYPTION)
if (password != NULL)
return MZ_PARAM_ERROR;
return MZ_SUPPORT_ERROR;
#endif
if (zip == NULL || file_info == NULL || file_info->filename == NULL)
return MZ_PARAM_ERROR;
@ -1837,12 +1840,9 @@ int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info, int1
mz_stream_write(zip->file_info_stream, file_info->comment, file_info->comment_size);
mz_stream_write_uint8(zip->file_info_stream, 0);
if (filename_pos > 0)
mz_stream_mem_get_buffer_at(zip->file_info_stream, filename_pos, (const void **)&zip->file_info.filename);
if (extrafield_pos > 0)
mz_stream_mem_get_buffer_at(zip->file_info_stream, extrafield_pos, (const void **)&zip->file_info.extrafield);
if (comment_pos > 0)
mz_stream_mem_get_buffer_at(zip->file_info_stream, comment_pos, (const void **)&zip->file_info.comment);
mz_stream_mem_get_buffer_at(zip->file_info_stream, filename_pos, (const void **)&zip->file_info.filename);
mz_stream_mem_get_buffer_at(zip->file_info_stream, extrafield_pos, (const void **)&zip->file_info.extrafield);
mz_stream_mem_get_buffer_at(zip->file_info_stream, comment_pos, (const void **)&zip->file_info.comment);
if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE)
{

9
mz_zip.h
View File

@ -42,16 +42,15 @@ typedef struct mz_zip_file_s
int64_t disk_offset; /* relative offset of local header */
uint16_t internal_fa; /* internal file attributes */
uint32_t external_fa; /* external file attributes */
uint16_t zip64; /* zip64 extension mode */
#ifdef HAVE_WZAES
uint16_t aes_version; /* winzip aes extension if not 0 */
uint8_t aes_encryption_mode; /* winzip aes encryption mode */
#endif
const char *filename; /* filename utf8 null-terminated string */
const uint8_t *extrafield; /* extrafield data */
const char *comment; /* comment utf8 null-terminated string */
uint16_t zip64; /* zip64 extension mode */
uint16_t aes_version; /* winzip aes extension if not 0 */
uint8_t aes_encryption_mode; /* winzip aes encryption mode */
} mz_zip_file, mz_zip_entry;
/***************************************************************************/

3
mz_zip_rw.c
View File

@ -1665,11 +1665,8 @@ int32_t mz_zip_writer_add_file(void *handle, const char *path, const char *filen
if (writer->zip_cd)
file_info.flag |= MZ_ZIP_FLAG_MASK_LOCAL_INFO;
#ifdef HAVE_WZAES
if (writer->aes)
file_info.aes_version = MZ_AES_VERSION;
#endif
mz_os_get_file_date(path, &file_info.modified_date, &file_info.accessed_date,
&file_info.creation_date);