From 1b22b8ed5147083ab43c3e803e2caa0e813c8696 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 28 Jan 2021 07:56:22 +0000 Subject: [PATCH] epan: don't print nanoseconds if seconds isn't representable. Fix for previous fixes to #17179. (cherry picked from commit 4715f5021cb44fcf672b9f8d23efa8e4601a8d1f) --- epan/print.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/print.c b/epan/print.c index a53a9693ff..e105e40313 100644 --- a/epan/print.c +++ b/epan/print.c @@ -1332,10 +1332,10 @@ ek_write_field_value(field_info *fi, write_json_data* pdata) #endif if (tm != NULL) { strftime(time_string, sizeof(time_string), "%FT%T", tm); + json_dumper_value_anyf(pdata->dumper, "\"%s.%uZ\"", time_string, t->nsecs); } else { - g_snprintf(time_string, sizeof(time_string), "Not representable"); + json_dumper_value_anyf(pdata->dumper, "\"Not representable\""); } - json_dumper_value_anyf(pdata->dumper, "\"%s.%uZ\"", time_string, t->nsecs); break; default: dfilter_string = fvalue_to_string_repr(NULL, &fi->value, FTREPR_DISPLAY, fi->hfinfo->display);