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

Use thread safe localtime_r function.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2019-04-28 10:05:29 -07:00
parent bdff1fc438
commit b9cb4e6a4d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minigzip.c
View File

@ -54,10 +54,12 @@ int32_t minigzip_copy(const char *path, const char *destination, int16_t operati
void *source_stream = NULL;
void *zlib_stream = NULL;
const char *filename = NULL;
char target_path[1024] = { 0 };
char target_path[1024];
int32_t err = 0;
memset(target_path, 0, sizeof(target_path));
if (destination != NULL)
{
if (mz_os_file_exists(destination) != MZ_OK)

13
mz_zip.c
View File

@ -45,8 +45,12 @@
#include <ctype.h> /* tolower */
#include <stdio.h> /* snprintf */
#if defined(_MSC_VER) && (_MSC_VER < 1900)
# define snprintf _snprintf
#if defined(_MSC_VER)
# if (_MSC_VER < 1900)
# define snprintf _snprintf
# else
# define localtime_r(t1,t2) localtime_s(t2,t1)
# endif
#endif
/***************************************************************************/
@ -2570,17 +2574,14 @@ time_t mz_zip_dosdate_to_time_t(uint64_t dos_date)
int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm)
{
struct tm *ltm = NULL;
if (ptm == NULL)
return MZ_PARAM_ERROR;
ltm = localtime(&unix_time); /* Returns a 1900-based year */
if (ltm == NULL)
if (localtime_r(&unix_time, ptm) == 0) /* Returns a 1900-based year */
{
/* Invalid date stored, so don't return it */
memset(ptm, 0, sizeof(struct tm));
return MZ_INTERNAL_ERROR;
}
memcpy(ptm, ltm, sizeof(struct tm));
return MZ_OK;
}