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 GCC warnings about path_length reuse in strncat.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2024-10-30 14:26:00 -07:00
parent 8950c248ae
commit 0bf8db3cff
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mz_zip_rw.c
View File

@ -650,7 +650,6 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path) {
int32_t err_attrib = 0; int32_t err_attrib = 0;
int32_t err = MZ_OK; int32_t err = MZ_OK;
int32_t err_cb = MZ_OK; int32_t err_cb = MZ_OK;
size_t path_length = 0;
char *pathwfs = NULL; char *pathwfs = NULL;
char *directory = NULL; char *directory = NULL;
@ -659,22 +658,18 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path) {
if (!reader->file_info || !path) if (!reader->file_info || !path)
return MZ_PARAM_ERROR; return MZ_PARAM_ERROR;
path_length = strlen(path);
/* Convert to forward slashes for unix which doesn't like backslashes */ /* Convert to forward slashes for unix which doesn't like backslashes */
pathwfs = (char *)calloc(path_length + 1, sizeof(char)); pathwfs = (char *)strdup(path);
if (!pathwfs) if (!pathwfs)
return MZ_MEM_ERROR; return MZ_MEM_ERROR;
strncat(pathwfs, path, path_length);
mz_path_convert_slashes(pathwfs, MZ_PATH_SLASH_UNIX); mz_path_convert_slashes(pathwfs, MZ_PATH_SLASH_UNIX);
if (reader->entry_cb) if (reader->entry_cb)
reader->entry_cb(handle, reader->entry_userdata, reader->file_info, pathwfs); reader->entry_cb(handle, reader->entry_userdata, reader->file_info, pathwfs);
directory = (char *)calloc(path_length + 1, sizeof(char)); directory = (char *)strdup(pathwfs);
if (!directory) if (!directory)
return MZ_MEM_ERROR; return MZ_MEM_ERROR;
strncat(directory, pathwfs, path_length);
mz_path_remove_filename(directory); mz_path_remove_filename(directory);
/* If it is a directory entry then create a directory instead of writing file */ /* If it is a directory entry then create a directory instead of writing file */