summaryrefslogtreecommitdiff
path: root/ui/gtk/profile_dlg.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-09 23:04:47 -0500
committerMichael Mann <mmann78@netscape.net>2015-01-10 04:20:27 +0000
commit5fe1f6617650f8fae37d53b038570fd941311f68 (patch)
tree2bcccbd9acb1df211026fe8502f93a45cbfa62b9 /ui/gtk/profile_dlg.c
parent3a9869d81a686effc4f8139e019333ca9e87e0ca (diff)
downloadwireshark-5fe1f6617650f8fae37d53b038570fd941311f68.tar.gz
Finish off emem_strbuf_t usage.
Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e Reviewed-on: https://code.wireshark.org/review/6461 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/profile_dlg.c')
-rw-r--r--ui/gtk/profile_dlg.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index f66f13be2d..43a3fdc9eb 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -139,6 +139,7 @@ profile_apply(GtkWidget *main_w, GtkTreeView *profile_l, gboolean destroy)
if ((err_msg = apply_profile_changes()) != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg);
+ g_free((gchar*)err_msg);
return;
}
@@ -735,9 +736,14 @@ profile_name_edit_ok(GtkWidget *w _U_, gpointer parent_w)
const gchar *new_name = gtk_entry_get_text(GTK_ENTRY(entry));
const gchar *profile_name = "";
gboolean from_global = FALSE;
- char *pf_dir_path, *pf_dir_path2, *pf_filename;
+ char *pf_dir_path, *pf_dir_path2, *pf_filename, *valid_name;
- if ((strlen(new_name) == 0) || (profile_name_is_valid(new_name) != NULL)) {
+ if (strlen(new_name) == 0) {
+ return;
+ }
+ valid_name = (char*)profile_name_is_valid(new_name);
+ if (valid_name != NULL) {
+ g_free(valid_name);
return;
}