osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

epan: don't assume gmtime_s() or gmtime_r() succeed. 

At least on Windows, gmtime_s() will *not* succeed if passed a negative
value.

Fixes #17179.
This commit is contained in:
Guy Harris 2021-01-27 21:46:11 -08:00
parent 6508b02ec4
commit 4e4a7c11c7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/print.c
View File

@ -1274,6 +1274,7 @@ ek_write_field_value(field_info *fi, write_json_data* pdata)
char *dfilter_string;
const nstime_t *t;
struct tm tm_time;
gboolean success;
char time_string[sizeof("YYYY-MM-DDTHH:MM:SS")];
/* Text label */
@ -1303,11 +1304,15 @@ ek_write_field_value(field_info *fi, write_json_data* pdata)
case FT_ABSOLUTE_TIME:
t = (const nstime_t *)fvalue_get(&fi->value);
#ifdef _WIN32
gmtime_s(&tm_time, &t->secs);
success = (gmtime_s(&tm_time, &t->secs) == 0);
#else
gmtime_r(&t->secs, &tm_time);
success = (gmtime_r(&t->secs, &tm_time) != NULL);
#endif
strftime(time_string, sizeof(time_string), "%FT%T", &tm_time);
if (success) {
strftime(time_string, sizeof(time_string), "%FT%T", &tm_time);
} else {
g_snprintf(time_string, sizeof(time_string), "Not representable");
}
json_dumper_value_anyf(pdata->dumper, "\"%s.%uZ\"", time_string, t->nsecs);
break;
default: