diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-10-21 19:18:15 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-10-22 02:27:32 +0000 |
commit | 10ca4c7527122efde0300205deaa6c0143f07219 (patch) | |
tree | 5352128043afff3b586c4a314ab2d240aec36f6a /ui | |
parent | 49cf42c571f3f94632957371ccd99533e71764ff (diff) | |
download | wireshark-10ca4c7527122efde0300205deaa6c0143f07219.tar.gz |
More checks for localtime() and gmtime() returning NULL.
And some comments in the case where we're converting the result of
time() - if your machine's idea of time predates January 1, 1970,
00:00:00 UTC, it'll crash on Windows, but that's not a case where a
*file* can cause the problem due either to a bad file time stamp or bad
time stamps in the file.
Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498
Reviewed-on: https://code.wireshark.org/review/18369
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/cli/tap-iostat.c | 86 | ||||
-rw-r--r-- | ui/cli/tap-iousers.c | 100 | ||||
-rw-r--r-- | ui/console.c | 15 | ||||
-rw-r--r-- | ui/gtk/fileset_dlg.c | 20 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.c | 23 | ||||
-rw-r--r-- | ui/gtk/io_stat.c | 21 | ||||
-rw-r--r-- | ui/gtk/main_welcome.c | 2 | ||||
-rw-r--r-- | ui/gtk/memory_dlg.c | 21 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c | 22 | ||||
-rw-r--r-- | ui/gtk/rtp_player.c | 10 | ||||
-rw-r--r-- | ui/text_import.c | 1 |
11 files changed, 195 insertions, 126 deletions
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index c23eb63bcb..1ff9b38b00 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -1013,60 +1013,78 @@ iostat_draw(void *arg) switch (timestamp_get_type()) { case TS_ABSOLUTE: tm_time = localtime(&the_time); - printf("| %02d:%02d:%02d |", - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec); + if (tm_time != NULL) { + printf("| %02d:%02d:%02d |", + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("| XX:XX:XX |"); break; case TS_ABSOLUTE_WITH_YMD: tm_time = localtime(&the_time); - printf("| %04d-%02d-%02d %02d:%02d:%02d |", - tm_time->tm_year + 1900, - tm_time->tm_mon + 1, - tm_time->tm_mday, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec); + if (tm_time != NULL) { + printf("| %04d-%02d-%02d %02d:%02d:%02d |", + tm_time->tm_year + 1900, + tm_time->tm_mon + 1, + tm_time->tm_mday, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("| XXXX-XX-XX XX:XX:XX |"); break; case TS_ABSOLUTE_WITH_YDOY: tm_time = localtime(&the_time); - printf("| %04d/%03d %02d:%02d:%02d |", - tm_time->tm_year + 1900, - tm_time->tm_yday + 1, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec); + if (tm_time != NULL) { + printf("| %04d/%03d %02d:%02d:%02d |", + tm_time->tm_year + 1900, + tm_time->tm_yday + 1, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("| XXXX/XXX XX:XX:XX |"); break; case TS_UTC: tm_time = gmtime(&the_time); - printf("| %02d:%02d:%02d |", - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec); + if (tm_time != NULL) { + printf("| %02d:%02d:%02d |", + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("| XX:XX:XX |"); break; case TS_UTC_WITH_YMD: tm_time = gmtime(&the_time); - printf("| %04d-%02d-%02d %02d:%02d:%02d |", - tm_time->tm_year + 1900, - tm_time->tm_mon + 1, - tm_time->tm_mday, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec); + if (tm_time != NULL) { + printf("| %04d-%02d-%02d %02d:%02d:%02d |", + tm_time->tm_year + 1900, + tm_time->tm_mon + 1, + tm_time->tm_mday, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("| XXXX-XX-XX XX:XX:XX |"); break; case TS_UTC_WITH_YDOY: tm_time = gmtime(&the_time); - printf("| %04d/%03d %02d:%02d:%02d |", - tm_time->tm_year + 1900, - tm_time->tm_yday + 1, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec); + if (tm_time != NULL) { + printf("| %04d/%03d %02d:%02d:%02d |", + tm_time->tm_year + 1900, + tm_time->tm_yday + 1, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("| XXXX/XXX XX:XX:XX |"); break; case TS_RELATIVE: diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c index 06f02697ac..129b56e580 100644 --- a/ui/cli/tap-iousers.c +++ b/ui/cli/tap-iousers.c @@ -140,71 +140,83 @@ iousers_draw(void *arg) switch (timestamp_get_type()) { case TS_ABSOLUTE: tm_time = localtime(&iui->start_abs_time.secs); - printf("%02d:%02d:%02d %12.4f\n", - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec, - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); + if (tm_time != NULL) { + printf("%02d:%02d:%02d", + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("XX:XX:XX"); break; case TS_ABSOLUTE_WITH_YMD: tm_time = localtime(&iui->start_abs_time.secs); - printf("%04d-%02d-%02d %02d:%02d:%02d %12.4f\n", - tm_time->tm_year + 1900, - tm_time->tm_mon + 1, - tm_time->tm_mday, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec, - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); + if (tm_time != NULL) { + printf("%04d-%02d-%02d %02d:%02d:%02d", + tm_time->tm_year + 1900, + tm_time->tm_mon + 1, + tm_time->tm_mday, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("XXXX-XX-XX XX:XX:XX"); break; case TS_ABSOLUTE_WITH_YDOY: tm_time = localtime(&iui->start_abs_time.secs); - printf("%04d/%03d %02d:%02d:%02d %12.4f\n", - tm_time->tm_year + 1900, - tm_time->tm_yday + 1, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec, - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); + if (tm_time != NULL) { + printf("%04d/%03d %02d:%02d:%02d", + tm_time->tm_year + 1900, + tm_time->tm_yday + 1, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("XXXX/XXX XX:XX:XX"); break; case TS_UTC: tm_time = gmtime(&iui->start_abs_time.secs); - printf("%02d:%02d:%02d %12.4f\n", - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec, - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); + if (tm_time != NULL) { + printf("%02d:%02d:%02d", + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("XX:XX:XX"); break; case TS_UTC_WITH_YMD: tm_time = gmtime(&iui->start_abs_time.secs); - printf("%04d-%02d-%02d %02d:%02d:%02d %12.4f\n", - tm_time->tm_year + 1900, - tm_time->tm_mon + 1, - tm_time->tm_mday, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec, - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); + if (tm_time != NULL) { + printf("%04d-%02d-%02d %02d:%02d:%02d", + tm_time->tm_year + 1900, + tm_time->tm_mon + 1, + tm_time->tm_mday, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("XXXX-XX-XX XX:XX:XX"); break; case TS_UTC_WITH_YDOY: tm_time = gmtime(&iui->start_abs_time.secs); - printf("%04d/%03d %02d:%02d:%02d %12.4f\n", - tm_time->tm_year + 1900, - tm_time->tm_yday + 1, - tm_time->tm_hour, - tm_time->tm_min, - tm_time->tm_sec, - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); + if (tm_time != NULL) { + printf("%04d/%03d %02d:%02d:%02d", + tm_time->tm_year + 1900, + tm_time->tm_yday + 1, + tm_time->tm_hour, + tm_time->tm_min, + tm_time->tm_sec); + } else + printf("XXXX/XXX XX:XX:XX"); break; case TS_RELATIVE: case TS_NOT_SET: default: - printf("%14.9f %12.4f\n", - nstime_to_sec(&iui->start_time), - nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time) - ); + printf("%14.9f", + nstime_to_sec(&iui->start_time)); break; } + printf(" %12.4f\n", + nstime_to_sec(&iui->stop_time) - nstime_to_sec(&iui->start_time)); } } max_frames = last_frames; diff --git a/ui/console.c b/ui/console.c index 94c6e5ac3f..2f3064b290 100644 --- a/ui/console.c +++ b/ui/console.c @@ -91,11 +91,16 @@ console_log_handler(const char *log_domain, GLogLevelFlags log_level, /* create a "timestamp" */ time(&curr); today = localtime(&curr); - - fprintf(stderr, "%02d:%02d:%02d %8s %s %s\n", - today->tm_hour, today->tm_min, today->tm_sec, - log_domain != NULL ? log_domain : "", - level, message); + if (today != NULL) { + fprintf(stderr, "%02d:%02d:%02d %8s %s %s\n", + today->tm_hour, today->tm_min, today->tm_sec, + log_domain != NULL ? log_domain : "", + level, message); + } else { + fprintf(stderr, "Time not representable %8s %s %s\n", + log_domain != NULL ? log_domain : "", + level, message); + } #ifdef _WIN32 if(log_level & G_LOG_LEVEL_ERROR) { /* wait for a key press before the following error handler will terminate the program diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index bb0e04d7fe..cc28f2b152 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -160,15 +160,23 @@ fileset_dlg_add_file(fileset_entry *entry, void *window _U_) { /* if this file doesn't follow the file set pattern, */ /* use the creation time of that file */ local = localtime(&entry->ctime); - created = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", - local->tm_year+1900, local->tm_mon+1, local->tm_mday, - local->tm_hour, local->tm_min, local->tm_sec); + if (local != NULL) { + created = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", + local->tm_year+1900, local->tm_mon+1, local->tm_mday, + local->tm_hour, local->tm_min, local->tm_sec); + } else { + created = g_strdup("Time not representable"); + } } local = localtime(&entry->mtime); - modified = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", - local->tm_year+1900, local->tm_mon+1, local->tm_mday, - local->tm_hour, local->tm_min, local->tm_sec); + if (local != NULL) { + modified = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", + local->tm_year+1900, local->tm_mon+1, local->tm_mday, + local->tm_hour, local->tm_min, local->tm_sec); + } else { + modified = g_strdup("Time not representable"); + } size = g_strdup_printf("%" G_GINT64_MODIFIER "d Bytes", entry->size); fs_rb = gtk_radio_button_new_with_label_from_widget( diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index f8b45d1c75..d4ade50f23 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -516,14 +516,21 @@ static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data, then = pinfo->abs_ts.secs; msecs = (guint16)(pinfo->abs_ts.nsecs/1000000); tm_tmp = localtime(&then); - g_snprintf(timeStr,sizeof(timeStr),"%02d/%02d/%04d %02d:%02d:%02d.%03d", - tm_tmp->tm_mon + 1, - tm_tmp->tm_mday, - tm_tmp->tm_year + 1900, - tm_tmp->tm_hour, - tm_tmp->tm_min, - tm_tmp->tm_sec, - msecs); + if (tm_tmp != NULL) { + /* + * XXX - somewhat US-centric here. + */ + g_snprintf(timeStr,sizeof(timeStr),"%02d/%02d/%04d %02d:%02d:%02d.%03d", + tm_tmp->tm_mon + 1, + tm_tmp->tm_mday, + tm_tmp->tm_year + 1900, + tm_tmp->tm_hour, + tm_tmp->tm_min, + tm_tmp->tm_sec, + msecs); + } else { + g_snprintf(timeStr,sizeof(timeStr),"XX/XX/XXXX XX:XX:XX.XXX", + } /* Default to using black on white text if nothing below overrides it */ g_snprintf(color_str,sizeof(color_str),"#ffffffffffff"); diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 7f3f4eee7c..2f16332506 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -488,15 +488,18 @@ print_interval_string(char *buf, int buf_len, guint32 interval, io_stat_t *io, nsec_val -= 1000; } tmp = localtime (&sec_val); - if (io->interval >= 1000) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); - } else if (io->interval >= 100) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%1d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/100); - } else if (io->interval >= 10) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/10); - } else { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val); - } + if (tmp != NULL) { + if (io->interval >= 1000) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + } else if (io->interval >= 100) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%1d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/100); + } else if (io->interval >= 10) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/10); + } else { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val); + } + } else + g_snprintf(buf, buf_len, "Time not representable"); } else { if (!ext) { g_snprintf(buf, buf_len, "%d.%03d", interval/1000,interval%1000); diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index 696446f7b4..5debeb0fa0 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -330,7 +330,7 @@ welcome_header_set_message(gchar *msg) { if (msg) { g_string_append(message, msg); } else { /* Use our default header */ - if ((now->tm_mon == 3 && now->tm_mday == 1) || (now->tm_mon == 6 && now->tm_mday == 14)) { + if (now != NULL && ((now->tm_mon == 3 && now->tm_mday == 1) || (now->tm_mon == 6 && now->tm_mday == 14))) { g_string_append(message, "Sniffing the glue that holds the Internet together"); } else { g_string_append(message, prefs.gui_start_title); diff --git a/ui/gtk/memory_dlg.c b/ui/gtk/memory_dlg.c index af06667076..d11122c2ae 100644 --- a/ui/gtk/memory_dlg.c +++ b/ui/gtk/memory_dlg.c @@ -130,15 +130,18 @@ print_interval_string(char *buf, int buf_len, guint32 interval, io_stat_t *io) nsec_val -= 1000; } tmp = localtime (&sec_val); - if (INTERVAL >= 1000) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); - } else if (INTERVAL >= 100) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%1d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/100); - } else if (INTERVAL >= 10) { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/10); - } else { - g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val); - } + if (tmp != NULL) { + if (INTERVAL >= 1000) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + } else if (INTERVAL >= 100) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%1d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/100); + } else if (INTERVAL >= 10) { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val/10); + } else { + g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val); + } + } else + g_snprintf(buf, buf_len, "XX:XX:XX"); } static void diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 239f8569da..0089624909 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -570,14 +570,20 @@ rtp_packet_add_info(GtkWidget *list, user_data_t * user_data, then = pinfo->abs_ts.secs; msecs = (guint16)(pinfo->abs_ts.nsecs/1000000); tm_tmp = localtime(&then); - g_snprintf(timeStr, sizeof(timeStr), "%02d/%02d/%04d %02d:%02d:%02d.%03d", - tm_tmp->tm_mon + 1, - tm_tmp->tm_mday, - tm_tmp->tm_year + 1900, - tm_tmp->tm_hour, - tm_tmp->tm_min, - tm_tmp->tm_sec, - msecs); + if (tm_tmp != NULL) { + /* + * XXX - somewhat US-centric. + */ + g_snprintf(timeStr, sizeof(timeStr), "%02d/%02d/%04d %02d:%02d:%02d.%03d", + tm_tmp->tm_mon + 1, + tm_tmp->tm_mday, + tm_tmp->tm_year + 1900, + tm_tmp->tm_hour, + tm_tmp->tm_min, + tm_tmp->tm_sec, + msecs); + } else + g_snprintf(timeStr, sizeof(timeStr), "XX/XX/XXXX XX:XX:XX.XXX"); /* Default to using black on white text if nothing below overrides it */ g_snprintf(color_str, sizeof(color_str), "#ffffffffffff"); diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index 7d051093ad..aaa029a51e 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -1303,7 +1303,10 @@ channel_draw(rtp_channel_info_t *rci) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_view_as_time_of_day))) { seconds = rci->start_time_abs.secs + i * MULT / sample_rate; timestamp = localtime(&seconds); - g_snprintf(label_string, MAX_TIME_LABEL, "%02d:%02d:%02d", timestamp->tm_hour, timestamp->tm_min, timestamp->tm_sec); + if (timestamp != NULL + g_snprintf(label_string, MAX_TIME_LABEL, "%02d:%02d:%02d", timestamp->tm_hour, timestamp->tm_min, timestamp->tm_sec); + else + g_snprintf(label_string, MAX_TIME_LABEL, "XX:XX:XX"); } else { g_snprintf(label_string, MAX_TIME_LABEL, "%.0f s", floor(nstime_to_sec(&rci->start_time_abs)) + i*MULT/sample_rate); } @@ -1451,7 +1454,10 @@ channel_draw(rtp_channel_info_t *rci) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_view_as_time_of_day))) { seconds = rci->start_time_abs.secs + i * MULT / sample_rate; timestamp = localtime(&seconds); - g_snprintf(label_string, MAX_TIME_LABEL, "%02d:%02d:%02d", timestamp->tm_hour, timestamp->tm_min, timestamp->tm_sec); + if (timestamp != NULL) + g_snprintf(label_string, MAX_TIME_LABEL, "%02d:%02d:%02d", timestamp->tm_hour, timestamp->tm_min, timestamp->tm_sec); + else + g_snprintf(label_string, MAX_TIME_LABEL, "XX:XX:XX"); } else { g_snprintf(label_string, MAX_TIME_LABEL, "%.0f s", floor(nstime_to_sec(&rci->start_time_abs)) + i*MULT/sample_rate); } diff --git a/ui/text_import.c b/ui/text_import.c index 93db8a2f93..0536028a5b 100644 --- a/ui/text_import.c +++ b/ui/text_import.c @@ -938,6 +938,7 @@ text_import(text_import_info_t *info) packet_start = 0; packet_preamble_len = 0; ts_sec = time(0); /* initialize to current time */ + /* We trust the OS not to provide a time before the Epoch. */ timecode_default = *localtime(&ts_sec); timecode_default.tm_isdst = -1; /* Unknown for now, depends on time given to the strptime() function */ ts_usec = 0; |