diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-11-16 03:13:02 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-11-16 03:13:02 +0000 |
commit | 741432d483bed382d7199dced14d754abfc3fd8c (patch) | |
tree | 0f4fee6555991f7698ce70ab8e9ad89bc0f1c541 | |
parent | c73c44cf4b5073f6bfa497bf83e40838029a3714 (diff) |
Handle ctime() and localtime() returning NULL and localtime() on Windows
blowing up when handed a bad value.
svn path=/trunk/; revision=39878
-rw-r--r-- | capinfos.c | 61 | ||||
-rw-r--r-- | gtk/summary_dlg.c | 52 |
2 files changed, 60 insertions, 53 deletions
diff --git a/capinfos.c b/capinfos.c index 831f48120e..b2e0d4ea98 100644 --- a/capinfos.c +++ b/capinfos.c @@ -252,42 +252,41 @@ disable_all_infos(void) #endif /* HAVE_LIBGCRYPT */ } -/* - * ctime_no_lf() - * - * This function simply truncates the string returned - * from the ctime() function to remove the trailing - * '\n' character. - * - * The ctime() function returns a string formatted as: - * "Www Mmm dd hh:mm:ss yyyy\n" - * The unwanted '\n' is the 24th character. - */ - -static gchar * -ctime_no_lf(const time_t* timer) -{ - gchar *time_string; - time_string = ctime(timer); - time_string[24] = '\0'; - return(time_string); -} - static gchar * -time_string(const time_t *timer, capture_info *cf_info, gboolean want_lf) +time_string(time_t timer, capture_info *cf_info, gboolean want_lf) { const gchar *lf = want_lf ? "\n" : ""; - static gchar time_string_buf[15]; + static gchar time_string_buf[20]; + char *time_string_ctime; if (cf_info->packet_count > 0) { if (time_as_secs) { /* XXX - Would it be useful to show sub-second precision? */ - g_snprintf(time_string_buf, 15, "%lu%s", (unsigned long) *timer, lf); + g_snprintf(time_string_buf, 20, "%lu%s", (unsigned long)timer, lf); return time_string_buf; - } else if (want_lf) { - return ctime(timer); } else { - return ctime_no_lf(timer); +#ifdef _MSC_VER + /* calling localtime(), and thus ctime(), on MSVC 2005 with huge values causes it to crash */ + /* XXX - find the exact value that still does work */ + /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */ + if (timer > 2000000000) { + time_string_ctime = NULL; + } else +#endif + time_string_ctime = ctime(&timer); + if (time_string_ctime == NULL) { + g_snprintf(time_string_buf, 20, "Not representable%s", lf); + return time_string_buf; + } + if (!want_lf) { + /* + * The ctime() function returns a string formatted as: + * "Www Mmm dd hh:mm:ss yyyy\n" + * The unwanted '\n' is the 24th character. + */ + time_string_ctime[24] = '\0'; + } + return time_string_ctime; } } @@ -346,8 +345,8 @@ print_stats(const gchar *filename, capture_info *cf_info) if (cap_file_size) printf ("File size: %" G_GINT64_MODIFIER "d bytes\n", cf_info->filesize); if (cap_data_size) printf ("Data size: %" G_GINT64_MODIFIER "u bytes\n", cf_info->packet_bytes); if (cap_duration) print_value("Capture duration: ", 0, " seconds", cf_info->duration); - if (cap_start_time) printf ("Start time: %s", time_string(&start_time_t, cf_info, TRUE)); - if (cap_end_time) printf ("End time: %s", time_string(&stop_time_t, cf_info, TRUE)); + if (cap_start_time) printf ("Start time: %s", time_string(start_time_t, cf_info, TRUE)); + if (cap_end_time) printf ("End time: %s", time_string(stop_time_t, cf_info, TRUE)); if (cap_data_rate_byte) print_value("Data byte rate: ", 2, " bytes/sec", cf_info->data_rate); if (cap_data_rate_bit) print_value("Data bit rate: ", 2, " bits/sec", cf_info->data_rate*8); if (cap_packet_size) printf ("Average packet size: %.2f bytes\n", cf_info->packet_size); @@ -516,14 +515,14 @@ print_stats_table(const gchar *filename, capture_info *cf_info) if (cap_start_time) { putsep(); putquote(); - printf("%s", time_string(&start_time_t, cf_info, FALSE)); + printf("%s", time_string(start_time_t, cf_info, FALSE)); putquote(); } if (cap_end_time) { putsep(); putquote(); - printf("%s", time_string(&stop_time_t, cf_info, FALSE)); + printf("%s", time_string(stop_time_t, cf_info, FALSE)); putquote(); } diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 6af42dc69c..df74339ef4 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -100,6 +100,34 @@ add_string_to_list(GtkWidget *list, gchar *title, gchar *captured, gchar *displa simple_list_append(list, 0, title, 1, captured, 2, displayed, 3, marked, -1); } +static void +time_to_string(char *string_buff, gulong string_buff_size, time_t ti_time) +{ + struct tm *ti_tm; + +#ifdef _MSC_VER + /* calling localtime() on MSVC 2005 with huge values causes it to crash */ + /* XXX - find the exact value that still does work */ + /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */ + if (ti_time > 2000000000) { + ti_tm = NULL; + } else +#endif + ti_tm = localtime(&ti_time); + if (ti_tm == NULL) { + g_snprintf(string_buff, string_buff_size, "Not representable"); + return; + } + g_snprintf(string_buff, string_buff_size, + "%04d-%02d-%02d %02d:%02d:%02d", + ti_tm->tm_year + 1900, + ti_tm->tm_mon + 1, + ti_tm->tm_mday, + ti_tm->tm_hour, + ti_tm->tm_min, + ti_tm->tm_sec); +} + void summary_open_cb(GtkWidget *w _U_, gpointer d _U_) { @@ -132,8 +160,6 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) gchar *str_dup; gchar *str_work; - time_t ti_time; - struct tm *ti_tm; unsigned int elapsed_time; iface_options iface; unsigned int i; @@ -193,29 +219,11 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) add_string_to_table(table, &row, "Time", ""); /* start time */ - ti_time = (time_t)summary.start_time; - ti_tm = localtime(&ti_time); - g_snprintf(string_buff, SUM_STR_MAX, - "%04d-%02d-%02d %02d:%02d:%02d", - ti_tm->tm_year + 1900, - ti_tm->tm_mon + 1, - ti_tm->tm_mday, - ti_tm->tm_hour, - ti_tm->tm_min, - ti_tm->tm_sec); + time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.start_time); add_string_to_table(table, &row, "First packet:", string_buff); /* stop time */ - ti_time = (time_t)summary.stop_time; - ti_tm = localtime(&ti_time); - g_snprintf(string_buff, SUM_STR_MAX, - "%04d-%02d-%02d %02d:%02d:%02d", - ti_tm->tm_year + 1900, - ti_tm->tm_mon + 1, - ti_tm->tm_mday, - ti_tm->tm_hour, - ti_tm->tm_min, - ti_tm->tm_sec); + time_to_string(string_buff, SUM_STR_MAX, (time_t)summary.stop_time); add_string_to_table(table, &row, "Last packet:", string_buff); /* elapsed seconds */ |