aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-04-14 08:50:41 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-04-14 08:50:41 +0000
commitf8e8ccac5c1661feb7bfedcc4bf33639aa049791 (patch)
tree37832db2ccaf4c451afe49496b4fe0f60c7ee2f8
parentf92ed70a3f39a99d62aa17d7e1d52ebd992c10a4 (diff)
bugfix: don't crash with a Null pointer exception, if the open file preview timestamp can't be converted
svn path=/trunk/; revision=17860
-rw-r--r--gtk/win32-file-dlg.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c
index d841789ceb..18998508d7 100644
--- a/gtk/win32-file-dlg.c
+++ b/gtk/win32-file-dlg.c
@@ -848,14 +848,18 @@ preview_set_filename(HWND of_hwnd, gchar *preview_file) {
/* first packet */
ti_time = (long)start_time;
ti_tm = localtime( &ti_time );
- _snwprintf(string_buff, PREVIEW_STR_MAX,
- _T("%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);
+ if(ti_tm) {
+ _snwprintf(string_buff, PREVIEW_STR_MAX,
+ _T("%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);
+ } else {
+ _snwprintf(string_buff, PREVIEW_STR_MAX, "?");
+ }
cur_ctrl = GetDlgItem(of_hwnd, EWFD_PTX_FIRST_PKT);
SetWindowText(cur_ctrl, string_buff);