Skip to content
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

Jump to bottom

Fix use of unsafe localtime() and portable gmtime_r() #1481

Merged
merged 1 commit into from
Aug 19, 2021
Merged

Fix use of unsafe localtime() and portable gmtime_r() #1481

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions librz/include/rz_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ typedef enum {
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define __WINDOWS__ 1

#include <time.h>
static inline struct tm *gmtime_r(const time_t *t, struct tm *r) {
return (gmtime_s(r, t)) ? NULL : r;
}
#endif

#if defined(EMSCRIPTEN) || defined(__linux__) || defined(__APPLE__) || defined(__GNU__) || defined(__ANDROID__) || defined(__QNX__) || defined(__sun) || defined(__HAIKU__)
Expand Down
1 change: 1 addition & 0 deletions librz/include/rz_util/rz_time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ RZ_API char *rz_time_to_string(ut64 ts);
RZ_API char *rz_asctime_r(const struct tm *tm, char *buf);
RZ_API char *rz_ctime_r(const time_t *timer, char *buf);
RZ_API struct tm *rz_localtime_r(const time_t *time, struct tm *res);
RZ_API struct tm *rz_gmtime_r(const time_t *time, struct tm *res);

#define RZ_TIME_PROFILE_ENABLED 0

Expand Down
4 changes: 2 additions & 2 deletions librz/magic/mdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ const char *file_fmttime(ut32 v, int local, char *pp) {
if (now == (time_t)0) {
struct tm *tm1;
(void)time(&now);
tm1 = localtime(&now);
tm1 = rz_localtime_r(&now, &timestruct);
if (!tm1)
return "*Invalid time*";
daylight = tm1->tm_isdst;
Expand All @@ -210,7 +210,7 @@ const char *file_fmttime(ut32 v, int local, char *pp) {
#endif /* HAVE_DAYLIGHT */
if (daylight)
t += 3600;
tm = gmtime_r(&t, &timestruct);
tm = rz_gmtime_r(&t, &timestruct);
if (!tm)
return "*Invalid time*";
rz_asctime_r(tm, pp);
Expand Down
8 changes: 4 additions & 4 deletions librz/type/format.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ static void rz_type_format_time(RzStrBuf *outbuf, int endian, int mode,
if (!timestr) {
return;
}
rz_asctime_r(gmtime_r((time_t *)&addr, &timestruct), timestr);
rz_asctime_r(rz_gmtime_r((time_t *)&addr, &timestruct), timestr);
*(timestr + 24) = '\0';
if (!SEEVALUE && !ISQUIET) {
rz_strbuf_appendf(outbuf, "0x%08" PFMT64x " = ", seeki + ((elem >= 0) ? elem * 4 : 0));
Expand All @@ -520,7 +520,7 @@ static void rz_type_format_time(RzStrBuf *outbuf, int endian, int mode,
}
while (size--) {
updateAddr(buf + i, size - i, endian, &addr, NULL);
rz_asctime_r(gmtime_r((time_t *)&addr, &timestruct), timestr);
rz_asctime_r(rz_gmtime_r((time_t *)&addr, &timestruct), timestr);
*(timestr + 24) = '\0';
if (elem == -1 || elem == 0) {
rz_strbuf_appendf(outbuf, "%s", timestr);
Expand All @@ -546,15 +546,15 @@ static void rz_type_format_time(RzStrBuf *outbuf, int endian, int mode,
if (!timestr) {
return;
}
rz_asctime_r(gmtime_r((time_t *)&addr, &timestruct), timestr);
rz_asctime_r(rz_gmtime_r((time_t *)&addr, &timestruct), timestr);
*(timestr + 24) = '\0';
if (size == -1) {
rz_strbuf_appendf(outbuf, "\"%s\"", timestr);
} else {
rz_strbuf_append(outbuf, "[ ");
while (size--) {
updateAddr(buf + i, size - i, endian, &addr, NULL);
rz_asctime_r(gmtime_r((time_t *)&addr, &timestruct), timestr);
rz_asctime_r(rz_gmtime_r((time_t *)&addr, &timestruct), timestr);
*(timestr + 24) = '\0';
if (elem == -1 || elem == 0) {
rz_strbuf_appendf(outbuf, "\"%s\"", timestr);
Expand Down
12 changes: 11 additions & 1 deletion librz/util/time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ RZ_API char *rz_time_stamp_to_str(ut32 timeStamp) {
#ifdef _MSC_VER
time_t rawtime;
struct tm *tminfo;
struct tm tmptm;
rawtime = (time_t)timeStamp;
tminfo = localtime(&rawtime);
tminfo = rz_localtime_r(&rawtime, &tmptm);
//tminfo = gmtime (&rawtime);
return rz_str_trim_dup(asctime(tminfo));
#else
Expand Down Expand Up @@ -209,6 +210,15 @@ RZ_API struct tm *rz_localtime_r(const time_t *time, struct tm *res) {
#endif
}

RZ_API struct tm *rz_gmtime_r(const time_t *time, struct tm *res) {
#if __WINDOWS__
errno_t err = gmtime_s(res, time);
return err ? NULL : res;
#else
return gmtime_r(time, res);
ret2libc marked this conversation as resolved.
Show resolved Hide resolved
#endif
}

RZ_API char *rz_asctime_r(const struct tm *tm, char *buf) {
#if __WINDOWS__
errno_t err = asctime_s(buf, ASCTIME_BUF_MINLEN, tm);
Expand Down