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

Fixed some code analysis warnings.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-12-01 08:59:21 -08:00
parent a893e6f678
commit 2df1ecbce4
9 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
minizip.c
View File

@ -231,7 +231,7 @@ int32_t minizip_add_progress_cb(void *handle, void *userdata, mz_zip_file *file_
/* Print the progress of the current compress operation */
if (options->verbose)
printf("%s - %"PRIu64" / %"PRIu64" (%.02f%%)\n", file_info->filename, position,
printf("%s - %"PRId64" / %"PRId64" (%.02f%%)\n", file_info->filename, position,
file_info->uncompressed_size, progress);
return MZ_OK;
}
@ -289,6 +289,7 @@ int32_t minizip_add(const char *path, const char *password, minizip_opt *options
mz_zip_writer_set_compress_method(writer, options->compress_method);
mz_zip_writer_set_compress_level(writer, options->compress_level);
mz_zip_writer_set_overwrite_cb(writer, options, minizip_add_overwrite_cb);
mz_zip_writer_set_comment(writer, "xyz");
mz_zip_writer_set_progress_cb(writer, options, minizip_add_progress_cb);
mz_zip_writer_set_entry_cb(writer, options, minizip_add_entry_cb);
mz_zip_writer_set_zip_cd(writer, options->zip_cd);
@ -355,7 +356,7 @@ int32_t minizip_extract_progress_cb(void *handle, void *userdata, mz_zip_file *f
/* Print the progress of the current extraction */
if (options->verbose)
printf("%s - %"PRIu64" / %"PRIu64" (%.02f%%)\n", file_info->filename, position,
printf("%s - %"PRId64" / %"PRId64" (%.02f%%)\n", file_info->filename, position,
file_info->uncompressed_size, progress);
return MZ_OK;

13
mz_crypt_win32.c
View File

@ -678,14 +678,15 @@ int32_t mz_crypt_sign_verify(uint8_t *message, int32_t message_size, uint8_t *si
if (result && decoded_size > 0)
decoded = (uint8_t *)MZ_ALLOC(decoded_size);
if (result)
if (result && decoded != NULL)
result = CryptVerifyMessageSignature(&verify_params, 0, signature, signature_size,
decoded, &decoded_size, NULL);
#if 0
crypt_msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, 0, 0, 0, NULL, NULL);
if (crypt_msg != NULL)
{
#if 0 /* Timestamp support */
/* Timestamp support */
PCRYPT_ATTRIBUTES unauth_attribs = NULL;
HCRYPTMSG ts_msg = 0;
uint8_t *ts_content = NULL;
@ -729,10 +730,14 @@ int32_t mz_crypt_sign_verify(uint8_t *message, int32_t message_size, uint8_t *si
if (crypt_context != NULL)
CryptMemFree(crypt_context);
#endif
}
else
{
result = 0;
}
#endif
if ((crypt_msg != NULL) && (result) && (decoded_size == message_size))
if ((result) && (decoded != NULL) && (decoded_size == message_size))
{
/* Verify cms message with our stored message */
if (memcmp(decoded, message, message_size) == 0)

6
mz_os_win32.c
View File

@ -44,8 +44,10 @@ wchar_t *mz_os_unicode_string_create(const char *string, int32_t encoding)
if (string_wide_size == 0)
return NULL;
string_wide = (wchar_t *)MZ_ALLOC((string_wide_size + 1) * sizeof(wchar_t));
memset(string_wide, 0, sizeof(wchar_t) * (string_wide_size + 1));
if (string_wide == NULL)
return NULL;
memset(string_wide, 0, sizeof(wchar_t) * (string_wide_size + 1));
MultiByteToWideChar(encoding, 0, string, -1, string_wide, string_wide_size);
return string_wide;
@ -391,6 +393,8 @@ DIR *mz_os_open_dir(const char *path)
return NULL;
dir_int = (DIR_int *)MZ_ALLOC(sizeof(DIR_int));
if (dir_int == NULL)
return NULL;
dir_int->find_handle = handle;
dir_int->end = 0;

2
mz_strm.c
View File

@ -267,7 +267,7 @@ int32_t mz_stream_find(void *stream, const void *find, int32_t find_size, int64_
disk_pos = mz_stream_tell(stream);
/* Seek to position on disk where the data was found */
err = mz_stream_seek(stream, disk_pos - (read + buf_pos - i), MZ_SEEK_SET);
err = mz_stream_seek(stream, disk_pos - ((int64_t)read + buf_pos - i), MZ_SEEK_SET);
if (err != MZ_OK)
return MZ_EXIST_ERROR;

21
mz_strm_mem.c
View File

@ -53,7 +53,7 @@ typedef struct mz_stream_mem_s {
/***************************************************************************/
static void mz_stream_mem_set_size(void *stream, int32_t size)
static int32_t mz_stream_mem_set_size(void *stream, int32_t size)
{
mz_stream_mem *mem = (mz_stream_mem *)stream;
int32_t new_size = size;
@ -61,6 +61,9 @@ static void mz_stream_mem_set_size(void *stream, int32_t size)
new_buf = (uint8_t *)MZ_ALLOC((uint32_t)new_size);
if (new_buf == NULL)
return MZ_BUF_ERROR;
if (mem->buffer)
{
memcpy(new_buf, mem->buffer, mem->size);
@ -69,11 +72,13 @@ static void mz_stream_mem_set_size(void *stream, int32_t size)
mem->buffer = new_buf;
mem->size = new_size;
return MZ_OK;
}
int32_t mz_stream_mem_open(void *stream, const char *path, int32_t mode)
{
mz_stream_mem *mem = (mz_stream_mem *)stream;
int32_t err = MZ_OK;
MZ_UNUSED(path);
@ -82,11 +87,11 @@ int32_t mz_stream_mem_open(void *stream, const char *path, int32_t mode)
mem->position = 0;
if (mem->mode & MZ_OPEN_MODE_CREATE)
mz_stream_mem_set_size(stream, mem->grow_size);
err = mz_stream_mem_set_size(stream, mem->grow_size);
else
mem->limit = mem->size;
return MZ_OK;
return err;
}
int32_t mz_stream_mem_is_open(void *stream)
@ -117,6 +122,7 @@ int32_t mz_stream_mem_write(void *stream, const void *buf, int32_t size)
{
mz_stream_mem *mem = (mz_stream_mem *)stream;
int32_t new_size = 0;
int32_t err = MZ_OK;
if (size == 0)
return size;
@ -131,7 +137,9 @@ int32_t mz_stream_mem_write(void *stream, const void *buf, int32_t size)
else
new_size += size;
mz_stream_mem_set_size(stream, new_size);
err = mz_stream_mem_set_size(stream, new_size);
if (err != MZ_OK)
return err;
}
else
{
@ -158,6 +166,7 @@ int32_t mz_stream_mem_seek(void *stream, int64_t offset, int32_t origin)
{
mz_stream_mem *mem = (mz_stream_mem *)stream;
int64_t new_pos = 0;
int32_t err = MZ_OK;
switch (origin)
{
@ -179,7 +188,9 @@ int32_t mz_stream_mem_seek(void *stream, int64_t offset, int32_t origin)
if ((mem->mode & MZ_OPEN_MODE_CREATE) == 0)
return MZ_SEEK_ERROR;
mz_stream_mem_set_size(stream, (int32_t)new_pos);
err = mz_stream_mem_set_size(stream, (int32_t)new_pos);
if (err != MZ_OK)
return err;
}
else if (new_pos < 0)
{

13
mz_zip.c
View File

@ -1465,12 +1465,14 @@ int32_t mz_zip_set_comment(void *handle, const char *comment)
return MZ_PARAM_ERROR;
if (zip->comment != NULL)
MZ_FREE(zip->comment);
comment_size = (int32_t)(strlen(comment) + 1);
zip->comment = (char *)MZ_ALLOC(comment_size);
comment_size = (int32_t)strlen(comment);
if (comment_size > UINT16_MAX)
return MZ_PARAM_ERROR;
zip->comment = (char *)MZ_ALLOC(comment_size + 1);
if (zip->comment == NULL)
return MZ_MEM_ERROR;
strncpy(zip->comment, comment, comment_size - 1);
zip->comment[comment_size - 1] = 0;
strncpy(zip->comment, comment, comment_size);
zip->comment[comment_size] = 0;
return MZ_OK;
}
@ -1975,7 +1977,8 @@ int32_t mz_zip_entry_read_close(void *handle, uint32_t *crc32, int64_t *compress
/* Seek to end of compressed stream since we might have over-read during compression */
if (err == MZ_OK)
err = mz_stream_seek(zip->stream, MZ_ZIP_SIZE_LD_ITEM +
zip->local_file_info.filename_size + zip->local_file_info.extrafield_size +
(int64_t)zip->local_file_info.filename_size +
(int64_t)zip->local_file_info.extrafield_size +
total_in, MZ_SEEK_CUR);
/* Read data descriptor */

6
mz_zip_rw.c
View File

@ -750,7 +750,8 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path)
return MZ_PARAM_ERROR;
/* Convert to forward slashes for unix which doesn't like backslashes */
strncpy(pathwfs, path, sizeof(pathwfs));
strncpy(pathwfs, path, sizeof(pathwfs) - 1);
pathwfs[sizeof(pathwfs) - 1] = 0;
for (i = 0; i < (int32_t)strlen(pathwfs); i += 1)
{
if (pathwfs[i] == '\\')
@ -887,7 +888,8 @@ int32_t mz_zip_reader_save_all(void *handle, const char *destination_dir)
utf8_string = mz_os_utf8_string_create(reader->file_info->filename, reader->encoding);
if (utf8_string)
{
strncpy(utf8_name, (char *)utf8_string, sizeof(utf8_name));
strncpy(utf8_name, (char *)utf8_string, sizeof(utf8_name) - 1);
utf8_name[sizeof(utf8_name) - 1] = 0;
mz_os_utf8_string_delete(&utf8_string);
}
}

1
test/fuzz/standalone.c
View File

@ -68,6 +68,7 @@ int main(int argc, char **argv)
buf_length = (int32_t)file_size;
mz_stream_os_seek(stream, 0, MZ_SEEK_SET);
buf = NULL;
if (buf_length > 0)
buf = MZ_ALLOC(buf_length);

8
test/test.c
View File

@ -436,7 +436,7 @@ int32_t test_stream_find_run(char *name, int32_t count, const uint8_t *find, int
if (find_cb == mz_stream_find)
mz_stream_seek(mem_stream, 0, MZ_SEEK_SET);
err = find_cb(mem_stream, (const void *)find, find_size, i + find_size, &position);
err = find_cb(mem_stream, (const void *)find, find_size, (int64_t)i + find_size, &position);
last_pos = mz_stream_tell(mem_stream);
mz_stream_mem_delete(&mem_stream);
@ -457,7 +457,7 @@ int32_t test_stream_find_run(char *name, int32_t count, const uint8_t *find, int
if (find_cb == mz_stream_find)
mz_stream_seek(mem_stream, 0, MZ_SEEK_SET);
err = find_cb(mem_stream, (const void *)find, find_size, i + find_size, &position);
err = find_cb(mem_stream, (const void *)find, find_size, (int64_t)i + find_size, &position);
last_pos = mz_stream_tell(mem_stream);
mz_stream_mem_delete(&mem_stream);
@ -480,7 +480,7 @@ int32_t test_stream_find_run(char *name, int32_t count, const uint8_t *find, int
if (find_cb == mz_stream_find)
mz_stream_seek(mem_stream, 0, MZ_SEEK_SET);
err = find_cb(mem_stream, (const void *)find, find_size, i + find_size + i, &position);
err = find_cb(mem_stream, (const void *)find, find_size, (int64_t)i + find_size + i, &position);
last_pos = mz_stream_tell(mem_stream);
mz_stream_mem_delete(&mem_stream);
@ -504,7 +504,7 @@ int32_t test_stream_find_run(char *name, int32_t count, const uint8_t *find, int
if (find_cb == mz_stream_find)
mz_stream_seek(mem_stream, 0, MZ_SEEK_SET);
err = find_cb(mem_stream, (const void *)find, find_size, i + find_size + i + 1, &position);
err = find_cb(mem_stream, (const void *)find, find_size, (int64_t)i + find_size + i + 1, &position);
last_pos = mz_stream_tell(mem_stream);
mz_stream_mem_delete(&mem_stream);