g_filename_display_basename() returns a g_mallocated string, so its

callers either need to free it or their callers need to free it or....

This means that cf_get_display_name() must always return a g_mallocated
string and its callers or... must free it.

For some of those callers, create a new set_window_title() routine to do
the work - they're all using the same pattern.

svn path=/trunk/; revision=43047

38 files changed, 187 insertions, 115 deletions

diff --git a/file.c b/file.c
index ddc441879d..62de66970a 100644
--- a/file.c
+++ b/file.c
@@ -486,7 +486,7 @@ cf_read(capture_file *cf, gboolean reloading)
 {
   int         err;
   gchar       *err_info;
-  const gchar *name_ptr;
+  gchar       *name_ptr;
   const char  *errmsg;
   char         errmsg_errno[1024+1];
   gint64       data_offset;
@@ -631,6 +631,9 @@ cf_read(capture_file *cf, gboolean reloading)
     ENDTRY;
   }
 
+  /* Free the display name */
+  g_free(name_ptr);
+
   /* Cleanup and release all dfilter resources */
   if (dfcode != NULL){
     dfilter_free(dfcode);
@@ -969,10 +972,10 @@ cf_finish_tail(capture_file *cf, int *err)
 }
 #endif /* HAVE_LIBPCAP */
 
-const gchar *
+gchar *
 cf_get_display_name(capture_file *cf)
 {
-  const gchar *displayname;
+  gchar *displayname;
 
   /* Return a name to use in displays */
   if (!cf->is_tempfile) {
@@ -980,16 +983,16 @@ cf_get_display_name(capture_file *cf)
     if (cf->filename){
       displayname = g_filename_display_basename(cf->filename);
     } else {
-      displayname="(No file)";
+      displayname=g_strdup("(No file)");
     }
   } else {
     /* The file we read is a temporary file from a live capture or
        a merge operation; we don't mention its name, but, if it's
        from a capture, give the source of the capture. */
     if (cf->source) {
-      displayname = cf->source;
+      displayname = g_strdup(cf->source);
     } else {
-      displayname = "(Untitled)";
+      displayname = g_strdup("(Untitled)");
     }
   }
   return displayname;
diff --git a/file.h b/file.h
index 661265c775..e3b9acff0e 100644
--- a/file.h
+++ b/file.h
@@ -237,9 +237,9 @@ cf_status_t cf_export_specified_packets(capture_file *cf, const char *fname,
  * Get a displayable name of the capture file.
  *
  * @param cf the capture file
- * @return the displayable name (don't have to be g_free'd)
+ * @return the displayable name (must be g_free'd)
  */
-const gchar *cf_get_display_name(capture_file *cf);
+gchar *cf_get_display_name(capture_file *cf);
 
 /**
  * Set the source of the capture data for temporary files, e.g.
diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
index d177a1f8c7..9af412ae70 100644
--- a/ui/gtk/afp_stat.c
+++ b/ui/gtk/afp_stat.c
@@ -60,12 +60,7 @@ typedef struct _afpstat_t {
 static void
 afpstat_set_title(afpstat_t *ss)
 {
-	char *title;
-
-	title = g_strdup_printf("AFP Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(ss->win), title);
-	g_free(title);
+	set_window_title(ss->win, "AFP Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c
index eaa4b85435..84105c5cdd 100644
--- a/ui/gtk/camel_srt.c
+++ b/ui/gtk/camel_srt.c
@@ -76,11 +76,7 @@ void register_tap_listener_gtk_camelsrt(void);
  */
 static void camelsrt_set_title(struct camelsrt_t * p_camelsrt)
 {
-  char * title;
-  title = g_strdup_printf("CAMEL Service Response Time statistics: %s",
-			  cf_get_display_name(&cfile));
-  gtk_window_set_title(GTK_WINDOW(p_camelsrt->win), title);
-  g_free(title);
+  set_window_title(p_camelsrt->win, "CAMEL Service Response Time statistics");
 }
 
 static void camelsrt_reset(void *phs)
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 53d9227da0..2dcb9d3e94 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -147,6 +147,7 @@ static wtap *
 preview_set_filename(GtkWidget *prev, const gchar *cf_name)
 {
     GtkWidget  *label;
+    gchar      *display_basename;
     wtap       *wth;
     int         err = 0;
     gchar      *err_info;
@@ -173,7 +174,9 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name)
     }
 
     label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
-    gtk_label_set_text(GTK_LABEL(label), g_filename_display_basename(cf_name));
+    display_basename = g_filename_display_basename(cf_name);
+    gtk_label_set_text(GTK_LABEL(label), display_basename);
+    g_free(display_basename);
 
     if (test_for_directory(cf_name) == EISDIR) {
         label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 5354248400..8b49bf7f1f 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -159,11 +159,7 @@ static GtkWidget *radio_TTL, *radio_ON;
 static void
 comparestat_set_title(compstat_t *cs)
 {
-	char *title;
-
-	title=g_strdup_printf("Compare two capture files: %s", cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(cs->win), title);
-	g_free(title);
+	set_window_title(cs->win, "Compare two capture files");
 }
 
 /* called when new capture starts, when it rescans the packetlist after some prefs have
@@ -702,6 +698,7 @@ static void
 gtk_comparestat_init(const char *optarg, void* userdata _U_)
 {
 	compstat_t *cs;
+	char *display_name;
 	char *title_string;
 	char *filter_string;
 	GtkWidget *stat_label;
@@ -764,7 +761,9 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	gtk_container_add(GTK_CONTAINER(cs->win), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
 
-	title_string = g_strdup_printf("Compare two capture files: %s", cf_get_display_name(&cfile));
+	display_name = cf_get_display_name(&cfile);
+	title_string = g_strdup_printf("Compare two capture files: %s", display_name);
+	g_free(display_name);
 	stat_label=gtk_label_new(title_string);
 	g_free(title_string);
 	gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index dc703a949d..8e10b11821 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -284,6 +284,7 @@ static void
 reset_ct_table_data(conversations_table *ct)
 {
     guint32 i;
+    char *display_name;
     char title[256];
     GString *error_string;
     const char *filter;
@@ -303,7 +304,9 @@ reset_ct_table_data(conversations_table *ct)
     }
 
     if(ct->page_lb) {
-        g_snprintf(title, sizeof(title), "Conversations: %s", cf_get_display_name(&cfile));
+    	display_name = cf_get_display_name(&cfile);
+        g_snprintf(title, sizeof(title), "Conversations: %s", display_name);
+        g_free(display_name);
         gtk_window_set_title(GTK_WINDOW(ct->win), title);
         g_snprintf(title, sizeof(title), "%s", ct->name);
         gtk_label_set_text(GTK_LABEL(ct->page_lb), title);
@@ -320,7 +323,9 @@ reset_ct_table_data(conversations_table *ct)
         }
         gtk_label_set_text(GTK_LABEL(ct->name_lb), title);
     } else {
-        g_snprintf(title, sizeof(title), "%s Conversations: %s", ct->name, cf_get_display_name(&cfile));
+    	display_name = cf_get_display_name(&cfile);
+        g_snprintf(title, sizeof(title), "%s Conversations: %s", ct->name, display_name);
+        g_free(display_name);
         gtk_window_set_title(GTK_WINDOW(ct->win), title);
     }
 
@@ -2529,6 +2534,7 @@ void
 init_conversation_table(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func)
 {
     conversations_table *conversations;
+    char *display_name;
     char title[256];
     GtkWidget *vbox;
     GtkWidget *bbox;
@@ -2542,7 +2548,9 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
     conversations->name=table_name;
     conversations->filter=filter;
     conversations->use_dfilter=FALSE;
-    g_snprintf(title, sizeof(title), "%s Conversations: %s", table_name, cf_get_display_name(&cfile));
+    display_name = cf_get_display_name(&cfile);
+    g_snprintf(title, sizeof(title), "%s Conversations: %s", table_name, display_name);
+    g_free(display_name);
     conversations->win = dlg_window_new(title);  /* transient_for top_level */
     gtk_window_set_destroy_with_parent (GTK_WINDOW(conversations->win), TRUE);
 
@@ -2744,6 +2752,7 @@ void
 init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
 {
     conversations_table *conversations;
+    char *display_name;
     char title[256];
     GtkWidget *vbox;
     GtkWidget *hbox;
@@ -2763,7 +2772,9 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
 
     pages = g_malloc(sizeof(void *) * (g_slist_length(registered_ct_tables) + 1));
 
-    g_snprintf(title, sizeof(title), "Conversations: %s", cf_get_display_name(&cfile));
+    display_name = cf_get_display_name(&cfile);
+    g_snprintf(title, sizeof(title), "Conversations: %s", display_name);
+    g_free(display_name);
     win = dlg_window_new(title);  /* transient_for top_level */
     gtk_window_set_destroy_with_parent (GTK_WINDOW(win), TRUE);
 
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index 504648febe..0cc9f4ea0c 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -94,8 +94,11 @@ static char *
 dcerpcstat_gen_title(dcerpcstat_t *rs)
 {
 	char *title;
+	char *display_name;
 
-	title = g_strdup_printf("DCE-RPC Service Response Time statistics for %s major version %u: %s", rs->prog, rs->ver, cf_get_display_name(&cfile));
+	display_name = cf_get_display_name(&cfile);
+	title = g_strdup_printf("DCE-RPC Service Response Time statistics for %s major version %u: %s", rs->prog, rs->ver, display_name);
+	g_free(display_name);
 	return title;
 }
 
diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c
index 2890de18d0..4cd1eba430 100644
--- a/ui/gtk/diameter_stat.c
+++ b/ui/gtk/diameter_stat.c
@@ -64,12 +64,7 @@ static GHashTable* cmd_str_hash;
 static void
 diameterstat_set_title(diameterstat_t *diameter)
 {
-	char		*title;
-
-	title = g_strdup_printf("Diameter Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(diameter->win), title);
-	g_free(title);
+	set_window_title(diameter->win, "Diameter Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index 7e36b18973..afa70330db 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -213,12 +213,7 @@ expert_dlg_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_
 static void
 error_set_title(expert_comp_dlg_t *ss)
 {
-    char *title;
-
-    title = g_strdup_printf("Expert Info: %s",
-        cf_get_display_name(&cfile));
-    gtk_window_set_title(GTK_WINDOW(ss->win), title);
-    g_free(title);
+    set_window_title(ss->win, "Expert Info");
 }
 
 static void
diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c
index 97ba070260..44561073d9 100644
--- a/ui/gtk/fc_stat.c
+++ b/ui/gtk/fc_stat.c
@@ -61,12 +61,7 @@ typedef struct _fcstat_t {
 static void
 fcstat_set_title(fcstat_t *fc)
 {
-	char		*title;
-
-	title = g_strdup_printf("Fibre Channel Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(fc->win), title);
-	g_free(title);
+	set_window_title(fc->win, "Fibre Channel Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 3a4bf9bd7f..0b58c0edde 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -1927,11 +1927,12 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data)
 	GtkWidget *hbuttonbox;
 	GtkWidget *bt_close;
 	GtkWidget *bt_save;
-	const gchar *title_name_ptr;
+	gchar   *title_name_ptr;
 	gchar   *win_name;
 
 	title_name_ptr = cf_get_display_name(&cfile);
 	win_name = g_strdup_printf("%s - Graph Analysis", title_name_ptr);
+	g_free(title_name_ptr);
 
 	/* create the main window */
 	user_data->dlg.window=dlg_window_new((user_data->dlg.title)?user_data->dlg.title:win_name);
diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c
index c603b1693a..32c8c67e29 100644
--- a/ui/gtk/gtp_stat.c
+++ b/ui/gtk/gtp_stat.c
@@ -60,12 +60,7 @@ typedef struct _gtpstat_t {
 static void
 gtpstat_set_title(gtpstat_t *gtp)
 {
-	char		*title;
-
-	title = g_strdup_printf("GTP Control Plane  Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(gtp->win), title);
-	g_free(title);
+	set_window_title(gtp->win, "GTP Control Plane  Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 6abbbde34c..bb6487f013 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -42,6 +42,8 @@
 
 #include <epan/packet_info.h>
 
+#include "../../globals.h"
+
 #include "ui/recent.h"
 #include "ui/ui_util.h"
 
@@ -1158,6 +1160,25 @@ create_user_window_title(const gchar *caption)
 }
 
 /*
+ * Set the title of a window based on a supplied caption and the
+ * display name for the capture file.
+ *
+ * XXX - should this include the user preference as well?
+ */
+void
+set_window_title(GtkWidget *win, const gchar *caption)
+{
+    char *title;
+    char *display_name;
+
+    display_name = cf_get_display_name(&cfile);
+    title = g_strdup_printf("%s: %s", caption, display_name);
+    g_free(display_name);
+    gtk_window_set_title(GTK_WINDOW(win), title);
+    g_free(title);
+}
+
+/*
  * This callback is invoked when keyboard focus is within either
  * the packetlist view or the detail view.  The keystrokes processed
  * within this callback are attempting to modify the detail view.
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index c941f3b7f5..79fa7b6ce4 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -297,6 +297,14 @@ extern void copy_binary_to_clipboard(const guint8* data_p, int len);
  */
 extern gchar *create_user_window_title(const gchar *caption);
 
+/** Set the title of a window based on a supplied caption and the
+ * display name for the capture file.
+ *
+ * @param win the window whose title is to be set
+ * @param caption caption string for the window
+ */
+extern void set_window_title(GtkWidget *win, const gchar *caption);
+
 /** Renders a float with two decimals precission, called from gtk_tree_view_column_set_cell_data_func().
  * the user data must be the colum number.
  * Present floats with two decimals 
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index c56ca9f383..4f67b52fad 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -181,6 +181,7 @@ static void
 reset_hostlist_table_data(hostlist_table *hosts)
 {
     guint32 i;
+    char *display_name;
     char title[256];
     GString *error_string;
     const char *filter;
@@ -200,7 +201,9 @@ reset_hostlist_table_data(hostlist_table *hosts)
 
 
     if(hosts->page_lb) {
-        g_snprintf(title, sizeof(title), "Endpoints: %s", cf_get_display_name(&cfile));
+        display_name = cf_get_display_name(&cfile);
+        g_snprintf(title, sizeof(title), "Endpoints: %s", display_name);
+        g_free(display_name);
         gtk_window_set_title(GTK_WINDOW(hosts->win), title);
         g_snprintf(title, sizeof(title), "%s", hosts->name);
         gtk_label_set_text(GTK_LABEL(hosts->page_lb), title);
@@ -217,7 +220,9 @@ reset_hostlist_table_data(hostlist_table *hosts)
         }
         gtk_label_set_text(GTK_LABEL(hosts->name_lb), title);
     } else {
-        g_snprintf(title, sizeof(title), "%s Endpoints: %s", hosts->name, cf_get_display_name(&cfile));
+        display_name = cf_get_display_name(&cfile);
+        g_snprintf(title, sizeof(title), "%s Endpoints: %s", hosts->name, display_name);
+        g_free(display_name);
         gtk_window_set_title(GTK_WINDOW(hosts->win), title);
     }
 
@@ -1373,6 +1378,7 @@ void
 init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func)
 {
     hostlist_table *hosttable;
+    char *display_name;
     char title[256];
     GtkWidget *vbox;
     GtkWidget *bbox;
@@ -1388,7 +1394,9 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
     hosttable->name=table_name;
     hosttable->filter=filter;
     hosttable->use_dfilter=FALSE;
-    g_snprintf(title, sizeof(title), "%s Endpoints: %s", table_name, cf_get_display_name(&cfile));
+    display_name = cf_get_display_name(&cfile);
+    g_snprintf(title, sizeof(title), "%s Endpoints: %s", table_name, display_name);
+    g_free(display_name);
     hosttable->win = dlg_window_new(title);  /* transient_for top_level */
     gtk_window_set_destroy_with_parent (GTK_WINDOW(hosttable->win), TRUE);
 
@@ -1601,6 +1609,7 @@ void
 init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
 {
     hostlist_table *hosttable;
+    char *display_name;
     char title[256];
     GtkWidget *vbox;
     GtkWidget *hbox;
@@ -1626,7 +1635,9 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     win = dlg_window_new("hostlist");  /* transient_for top_level */
     gtk_window_set_destroy_with_parent (GTK_WINDOW(win), TRUE);
 
-    g_snprintf(title, sizeof(title), "Endpoints: %s", cf_get_display_name(&cfile));
+    display_name = cf_get_display_name(&cfile);
+    g_snprintf(title, sizeof(title), "Endpoints: %s", display_name);
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(win), title);
     gtk_window_set_default_size(GTK_WINDOW(win), 750, 400);
 
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index 343cbd3cdb..c243248300 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -198,14 +198,10 @@ static void filter_callback(GtkWidget *widget _U_, gpointer user_data);
 static void
 io_stat_set_title(io_stat_t *io)
 {
-	char		*title;
-
 	if(!io->window){
 		return;
 	}
-	title = g_strdup_printf("Wireshark IO Graphs: %s", cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(io->window), title);
-	g_free(title);
+	set_window_title(io->window, "Wireshark IO Graphs");
 }
 
 static void
diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c
index efb99a0d18..7ae9634915 100644
--- a/ui/gtk/ldap_stat.c
+++ b/ui/gtk/ldap_stat.c
@@ -59,12 +59,7 @@ typedef struct _ldapstat_t {
 static void
 ldapstat_set_title(ldapstat_t *ldap)
 {
-	char		*title;
-
-	title = g_strdup_printf("LDAP Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(ldap->win), title);
-	g_free(title);
+	set_window_title(ldap->win, "LDAP Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
index 318358d340..7a9b7e8d82 100644
--- a/ui/gtk/mac_lte_stat_dlg.c
+++ b/ui/gtk/mac_lte_stat_dlg.c
@@ -216,15 +216,18 @@ static void mac_lte_stat_reset(void *phs)
 {
     mac_lte_stat_t* mac_lte_stat = (mac_lte_stat_t *)phs;
     mac_lte_ep_t* list = mac_lte_stat->ep_list;
+    char *display_name;
     gchar title[256];
     GtkListStore *store;
     gint i, n;
 
     /* Set the title */
     if (mac_lte_stat->mac_lte_stat_dlg_w != NULL) {
+        display_name = cf_get_display_name(&cfile);
         g_snprintf(title, sizeof(title), "Wireshark: LTE MAC Traffic Statistics: %s (filter=\"%s\")",
-                   cf_get_display_name(&cfile),
+                   display_name,
                    strlen(mac_lte_stat->filter) ? mac_lte_stat->filter : "none");
+        g_free(display_name);
         gtk_window_set_title(GTK_WINDOW(mac_lte_stat->mac_lte_stat_dlg_w), title);
     }
 
@@ -638,6 +641,7 @@ static void mac_lte_stat_draw(void *phs)
 {
     gchar   buff[32];
     guint16 number_of_ues = 0;
+    char *display_name;
     gchar title[256];
 
     /* Look up the statistics window */
@@ -680,11 +684,13 @@ static void mac_lte_stat_draw(void *phs)
     gtk_frame_set_label(GTK_FRAME(hs->mac_lte_stat_ues_lb), title);
 
     /* Update title to include number of UEs and frames */
+    display_name = cf_get_display_name(&cfile);
     g_snprintf(title, sizeof(title), "Wireshark: LTE MAC Traffic Statistics: %s (%u UEs, %u frames) (filter=\"%s\")",
-               cf_get_display_name(&cfile),
+               display_name,
                number_of_ues,
                hs->common_stats.all_frames,
                strlen(hs->filter) ? hs->filter : "none");
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(hs->mac_lte_stat_dlg_w), title);
 
 
@@ -1007,6 +1013,7 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     GtkCellRenderer   *renderer;
     GtkTreeViewColumn *column;
     GtkTreeSelection  *sel;
+    gchar *display_name;
     gchar title[256];
     gint i, n;
 
@@ -1034,8 +1041,10 @@ static void gtk_mac_lte_stat_init(const char *optarg, void *userdata _U_)
     }
 
     /* Set title */
+    display_name = cf_get_display_name(&cfile);
     g_snprintf(title, sizeof(title), "Wireshark: LTE MAC Statistics: %s",
-               cf_get_display_name(&cfile));
+               display_name);
+    g_free(display_name);
 
     /* Create top-level window */
     hs->mac_lte_stat_dlg_w = window_new_with_geom(GTK_WINDOW_TOPLEVEL, title, "LTE MAC Statistics");
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index f6803c40d7..311314df96 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -1334,10 +1334,13 @@ resolv_update_cb(gpointer data _U_)
 static void
 set_display_filename(capture_file *cf)
 {
+  gchar *display_name;
   gchar *window_name;
 
   if (cf->filename) {
-    window_name = g_strdup_printf("%s", cf_get_display_name(cf));
+    display_name = cf_get_display_name(cf);
+    window_name = g_strdup_printf("%s", display_name);
+    g_free(display_name);
     main_set_window_name(window_name);
     g_free(window_name);
   } else {
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index b7797d9ffa..937aaf8581 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -740,14 +740,14 @@ statusbar_cf_file_closed_cb(capture_file *cf _U_)
 static void
 statusbar_cf_file_read_started_cb(capture_file *cf, const char *action)
 {
-    const gchar *name_ptr;
+    gchar *name_ptr;
 
     /* Ensure we pop any previous loaded filename */
     statusbar_pop_file_msg();
 
     name_ptr = g_filename_display_basename(cf->filename);
-
     statusbar_push_file_msg(" %s: %s", action, name_ptr);
+    g_free(name_ptr);
 }
 
 
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index e4b6ad0c95..49379ea076 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -649,11 +649,12 @@ mcaststream_dlg_create(void)
 	GtkWidget *bt_params;
 	GtkWidget *bt_close;
 
-	const gchar *title_name_ptr;
+	gchar *title_name_ptr;
 	gchar *win_name;
 
 	title_name_ptr = cf_get_display_name(&cfile);
 	win_name = g_strdup_printf("%s - UDP Multicast Streams", title_name_ptr);
+        g_free(title_name_ptr);
 	mcaststream_dlg_w = dlg_window_new(win_name);
 
 	gtk_window_set_default_size(GTK_WINDOW(mcaststream_dlg_w), 620, 400);
diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c
index af81678614..1bc7d50e2c 100644
--- a/ui/gtk/ncp_stat.c
+++ b/ui/gtk/ncp_stat.c
@@ -266,12 +266,7 @@ static const value_string ncp_nds_verb_vals[] = {
 static void
 ncpstat_set_title(ncpstat_t *ss)
 {
-	char *title;
-
-	title = g_strdup_printf("NCP Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(ss->win), title);
-	g_free(title);
+	set_window_title(ss->win, "NCP Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index 2972305312..822972b297 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -277,14 +277,17 @@ static void rlc_lte_stat_reset(void *phs)
 {
     rlc_lte_stat_t* rlc_lte_stat = (rlc_lte_stat_t *)phs;
     rlc_lte_ep_t* list = rlc_lte_stat->ep_list;
+    gchar *display_name;
     gchar title[256];
     GtkListStore *store;
 
     /* Set the title */
     if (rlc_lte_stat->dlg_w != NULL) {
+        display_name = cf_get_display_name(&cfile);
         g_snprintf(title, sizeof(title), "Wireshark: LTE RLC Traffic Statistics: %s (filter=\"%s\")",
-                   cf_get_display_name(&cfile),
+                   display_name,
                    strlen(rlc_lte_stat->filter) ? rlc_lte_stat->filter : "none");
+        g_free(display_name);
         gtk_window_set_title(GTK_WINDOW(rlc_lte_stat->dlg_w), title);
     }
 
@@ -720,6 +723,7 @@ static void rlc_lte_stat_draw(void *phs)
 {
     gchar   buff[32];
     guint16 number_of_ues = 0;
+    gchar *display_name;
     gchar title[256];
 
     /* Look up the statistics window */
@@ -751,11 +755,13 @@ static void rlc_lte_stat_draw(void *phs)
     gtk_frame_set_label(GTK_FRAME(hs->ues_lb), title);
 
     /* Update title to include number of UEs and frames */
+    display_name = cf_get_display_name(&cfile);
     g_snprintf(title, sizeof(title), "Wireshark: LTE RLC Traffic Statistics: %s (%u UEs, %u frames) (filter=\"%s\")",
-               cf_get_display_name(&cfile),
+               display_name,
                number_of_ues,
                hs->total_frames,
                strlen(hs->filter) ? hs->filter : "none");
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(hs->dlg_w), title);
 
 
@@ -1243,6 +1249,7 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
     GtkCellRenderer   *renderer;
     GtkTreeViewColumn *column;
     GtkTreeSelection  *sel;
+    gchar *display_name;
     gchar title[256];
     gint i;
 
@@ -1271,8 +1278,10 @@ static void gtk_rlc_lte_stat_init(const char *optarg, void *userdata _U_)
 
 
     /* Set title */
+    display_name = cf_get_display_name(&cfile);
     g_snprintf(title, sizeof(title), "Wireshark: LTE RLC Statistics: %s",
-               cf_get_display_name(&cfile));
+               display_name);
+    g_free(display_name);
     hs->dlg_w = window_new_with_geom(GTK_WINDOW_TOPLEVEL, title, "LTE RLC Statistics");
 
     /* Window size */
diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c
index b8f35b6cb8..4118f98bd1 100644
--- a/ui/gtk/rpc_progs.c
+++ b/ui/gtk/rpc_progs.c
@@ -92,10 +92,13 @@ static rpc_program_t *prog_list=NULL;
 static char *
 rpcprogs_gen_title(void)
 {
+	char *display_name;
 	char *title;
 
+	display_name = cf_get_display_name(&cfile);
 	title = g_strdup_printf("ONC-RPC Program Statistics: %s",
-	    cf_get_display_name(&cfile));
+	    display_name);
+	g_free(display_name);
 	return title;
 }
 
diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index 5fc19b943d..b32ff2329e 100644
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -70,10 +70,13 @@ typedef struct _rpcstat_t {
 static char *
 rpcstat_gen_title(rpcstat_t *rs)
 {
+	char *display_name;
 	char *title;
 
+	display_name = cf_get_display_name(&cfile);
 	title = g_strdup_printf("ONC-RPC Service Response Time statistics for %s version %d: %s",
-	    rs->prog, rs->version, cf_get_display_name(&cfile));
+	    rs->prog, rs->version, display_name);
+	g_free(display_name);
 	return title;
 }
 
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index f70c40bf30..1920437e3a 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -2325,11 +2325,12 @@ rtp_player_dlg_create(void)
 	GtkWidget *bt_close;
 	GtkAdjustment *jitter_spinner_adj;
 	GtkWidget *label;
-	const gchar *title_name_ptr;
+	gchar *title_name_ptr;
 	gchar   *win_name;
 
 	title_name_ptr = cf_get_display_name(&cfile);
 	win_name = g_strdup_printf("%s - VoIP - RTP Player", title_name_ptr);
+	g_free(title_name_ptr);
 
 	rtp_player_dlg_w = dlg_window_new(win_name);  /* transient_for top_level */
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(rtp_player_dlg_w), TRUE);
diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c
index 269e58e506..f8e5d292a1 100644
--- a/ui/gtk/scsi_stat.c
+++ b/ui/gtk/scsi_stat.c
@@ -82,10 +82,13 @@ enum
 static char *
 scsistat_gen_title(scsistat_t *rs)
 {
+	char *display_name;
 	char *title;
 
+	display_name = cf_get_display_name(&cfile);
 	title = g_strdup_printf("SCSI Service Response Time statistics for %s: %s",
-	    rs->prog, cf_get_display_name(&cfile));
+	    rs->prog, display_name);
+	g_free(display_name);
 	return title;
 }
 
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 187ed9ea64..b74d283546 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -449,12 +449,15 @@ sctp_set_filter (GtkButton *button _U_, struct sctp_analyse* u_data)
 
 static void analyse_window_set_title(struct sctp_analyse *u_data)
 {
+	char *display_name;
 	char *title;
 
 	if(!u_data->window){
 		return;
 	}
-	title = g_strdup_printf("SCTP Analyse Association: %s Port1 %u  Port2 %u", cf_get_display_name(&cfile), u_data->assoc->port1, u_data->assoc->port2);
+	display_name = cf_get_display_name(&cfile);
+	title = g_strdup_printf("SCTP Analyse Association: %s Port1 %u  Port2 %u", display_name, u_data->assoc->port1, u_data->assoc->port2);
+	g_free(display_name);
 	gtk_window_set_title(GTK_WINDOW(u_data->window), title);
 	g_free(title);
 }
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 28662103ca..eacbbf6032 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -1315,14 +1315,17 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 
 static void sctp_graph_set_title(struct sctp_udata *u_data)
 {
+	char *display_name;
 	char *title;
 
 	if(!u_data->io->window)
 	{
 		return;
 	}
+	display_name = cf_get_display_name(&cfile);
 	title = g_strdup_printf("SCTP Data and Adv.Rcv.Window over Time: %s Port1 %u Port2 %u Endpoint %u",
-	                        cf_get_display_name(&cfile), u_data->parent->assoc->port1, u_data->parent->assoc->port2, u_data->dir);
+	                        display_name, u_data->parent->assoc->port1, u_data->parent->assoc->port2, u_data->dir);
+	g_free(display_name);
 	gtk_window_set_title(GTK_WINDOW(u_data->io->window), title);
 	g_free(title);
 }
diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
index 4c2b4d3786..ed6860a2d7 100644
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@@ -580,12 +580,16 @@ on_close_dlg (GtkButton *button _U_, gpointer user_data)
 static void
 path_window_set_title(struct sctp_udata *u_data, unsigned int direction)
 {
+    char *display_name;
     char *title;
+
     if(!u_data->io->window){
         return;
     }
+    display_name = cf_get_display_name(&cfile);
     title = g_strdup_printf("SCTP Path Chunk Statistics for Endpoint %u: %s Port1 %u  Port2 %u",direction,
-                            cf_get_display_name(&cfile), u_data->assoc->port1, u_data->assoc->port2);
+                            display_name, u_data->assoc->port1, u_data->assoc->port2);
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(u_data->io->window), title);
     g_free(title);
 }
@@ -646,12 +650,16 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction)
 static void
 chunk_window_set_title(struct sctp_udata *u_data)
 {
+    char *display_name;
     char *title;
+
     if(!u_data->io->window){
         return;
     }
+    display_name = cf_get_display_name(&cfile);
     title = g_strdup_printf("SCTP Association Chunk Statistics: %s Port1 %u  Port2 %u",
-                            cf_get_display_name(&cfile), u_data->assoc->port1, u_data->assoc->port2);
+                            display_name, u_data->assoc->port1, u_data->assoc->port2);
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(u_data->io->window), title);
     g_free(title);
 }
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index d6cf041bbb..5481931345 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -1731,14 +1731,17 @@ init_sctp_graph_window(struct sctp_udata *u_data)
 static void
 sctp_graph_set_title(struct sctp_udata *u_data)
 {
+	char *display_name;
 	char *title;
 
 	if(!u_data->io->window)
 	{
 		return;
 	}
+	display_name = cf_get_display_name(&cfile);
 	title = g_strdup_printf("SCTP TSNs and Sacks over Time: %s Port1 %u Port2 %u Endpoint %u",
-	                        cf_get_display_name(&cfile), u_data->parent->assoc->port1, u_data->parent->assoc->port2, u_data->dir);
+	                        display_name, u_data->parent->assoc->port1, u_data->parent->assoc->port2, u_data->dir);
+	g_free(display_name);
 	gtk_window_set_title(GTK_WINDOW(u_data->io->window), title);
 	g_free(title);
 }
diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c
index 6c491cd2b1..91a5eebf73 100644
--- a/ui/gtk/smb2_stat.c
+++ b/ui/gtk/smb2_stat.c
@@ -60,12 +60,7 @@ typedef struct _smb2stat_t {
 static void
 smb2stat_set_title(smb2stat_t *ss)
 {
-	char *title;
-
-	title = g_strdup_printf("SMB2 Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(ss->win), title);
-	g_free(title);
+	set_window_title(ss->win, "SMB2 Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c
index a7ceb37ef2..aa71d1a5db 100644
--- a/ui/gtk/smb_stat.c
+++ b/ui/gtk/smb_stat.c
@@ -62,12 +62,7 @@ typedef struct _smbstat_t {
 static void
 smbstat_set_title(smbstat_t *ss)
 {
-	char *title;
-
-	title = g_strdup_printf("SMB Service Response Time statistics: %s",
-	    cf_get_display_name(&cfile));
-	gtk_window_set_title(GTK_WINDOW(ss->win), title);
-	g_free(title);
+	set_window_title(ss->win, "SMB Service Response Time statistics");
 }
 
 static void
diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c
index d8da0d3e90..54d4bb50bf 100644
--- a/ui/gtk/tap_param_dlg.c
+++ b/ui/gtk/tap_param_dlg.c
@@ -76,11 +76,14 @@ register_dfilter_stat(tap_param_dlg *info, const char *name _U_,
 void tap_param_dlg_update (void)
 {
     tap_param_dlg_list_item *dialog = start_dlg_list;
+    char *display_name;
     char *title;
 
     while(dialog != NULL) {
         if(dialog->dlg) {
-            title = g_strdup_printf("Wireshark: %s: %s", dialog->cont.win_title , cf_get_display_name(&cfile));
+            display_name = cf_get_display_name(&cfile);
+            title = g_strdup_printf("Wireshark: %s: %s", dialog->cont.win_title , display_name);
+            g_free(display_name);
             gtk_window_set_title(GTK_WINDOW(dialog->dlg), title);
             g_free(title);
         }
@@ -131,6 +134,7 @@ void
 tap_param_dlg_cb(GtkAction *action _U_, gpointer data)
 {
     const char *filter;
+    char *display_name;
     char *title;
     GtkWidget *dlg_box;
     GtkWidget *item_box, *item, *label, *filter_bt;
@@ -187,7 +191,9 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data)
         return;
     }
 
-    title = g_strdup_printf("Wireshark: %s: %s", current_dlg->cont.win_title , cf_get_display_name(&cfile));
+    display_name = cf_get_display_name(&cfile);
+    title = g_strdup_printf("Wireshark: %s: %s", current_dlg->cont.win_title , display_name);
+    g_free(display_name);
 
     current_dlg->dlg=dlg_window_new(title);
     gtk_window_set_default_size(GTK_WINDOW(current_dlg->dlg), 300, -1);
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index 16b597fe0b..b5da7075a2 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -694,6 +694,7 @@ static void create_drawing_area (struct graph *g)
 	GdkColormap *colormap;
 	GdkColor color;
 #endif
+	char *display_name;
 	char window_title[WINDOW_TITLE_LENGTH];
 	struct segment current;
 	struct tcpheader *thdr;
@@ -706,14 +707,16 @@ static void create_drawing_area (struct graph *g)
 #endif
 	debug(DBS_FENTRY) puts ("create_drawing_area()");
 	thdr=select_tcpip_session (&cfile, &current);
+	display_name = cf_get_display_name(&cfile);
 	g_snprintf (window_title, WINDOW_TITLE_LENGTH, "TCP Graph %d: %s %s:%d -> %s:%d",
 			refnum,
-			cf_get_display_name(&cfile),
+			display_name,
 			ep_address_to_str(&(thdr->ip_src)),
 			thdr->th_sport,
 			ep_address_to_str(&(thdr->ip_dst)),
 			thdr->th_dport
 	);
+	g_free(display_name);
 	g->toplevel = dlg_window_new ("Tcp Graph");
 	gtk_window_set_title(GTK_WINDOW(g->toplevel), window_title);
 	gtk_widget_set_name (g->toplevel, "Test Graph");
diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
index cbe3901201..44244c996e 100644
--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@@ -678,11 +678,12 @@ voip_calls_dlg_create(void)
 	GtkWidget *hbuttonbox;
 	GtkWidget *bt_close;
 	GtkWidget *bt_select_all;
-	const gchar *title_name_ptr;
+	gchar *title_name_ptr;
 	gchar *win_name;
 
 	title_name_ptr = cf_get_display_name(&cfile);
 	win_name = g_strdup_printf("%s - VoIP Calls", title_name_ptr);
+	g_free(title_name_ptr);
 	voip_calls_dlg_w = dlg_window_new(win_name);  /* transient_for top_level */
 	gtk_window_set_destroy_with_parent(GTK_WINDOW(voip_calls_dlg_w), TRUE);
 
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index 777fb4fe9d..612d2b7ca4 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -159,14 +159,17 @@ wlanstat_reset (void *phs)
 	wlanstat_t* wlan_stat = (wlanstat_t *)phs;
 	wlan_ep_t* list = wlan_stat->ep_list;
 	wlan_ep_t* tmp = NULL;
+	char *display_name;
 	char title[256];
 	GString *error_string;
 	GtkListStore *store;
 	const char *filter = NULL;
 
 	if (wlanstat_dlg_w != NULL) {
-            g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
-			    cf_get_display_name(&cfile));
+		display_name = cf_get_display_name(&cfile);
+		g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
+			    display_name);
+		g_free(display_name);
 		gtk_window_set_title(GTK_WINDOW(wlanstat_dlg_w), title);
 	}
 
@@ -1739,6 +1742,7 @@ wlanstat_dlg_create (void)
 	GtkCellRenderer   *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection  *sel;
+	char *display_name;
 	char title[256];
 	gint i;
 
@@ -1750,8 +1754,10 @@ wlanstat_dlg_create (void)
 	hs->use_dfilter = FALSE;
 	hs->show_only_existing = FALSE;
 
+	display_name = cf_get_display_name(&cfile);
 	g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
-		    cf_get_display_name(&cfile));
+		    display_name);
+	g_free(display_name);
 	wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics");
 	gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400);