diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-01 03:15:29 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-01 03:15:29 +0000 |
| commit | 9630bf353e2ca03bdce5d7ce00f184c898ba40cd (patch) | |
| tree | 26e3986b7a2b9bf989d9f7089f0900839c860eb6 /gtk | |
| parent | db0d014224979e30a62f08cbeb8ae602ae55326e (diff) | |
| download | wireshark-9630bf353e2ca03bdce5d7ce00f184c898ba40cd.tar.gz wireshark-9630bf353e2ca03bdce5d7ce00f184c898ba40cd.tar.bz2 wireshark-9630bf353e2ca03bdce5d7ce00f184c898ba40cd.zip | |
Fix a few more memleaks found by valgrind (all deriving
from the get_persconffile_path mess).
svn path=/trunk/; revision=5927
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 9 | ||||
| -rw-r--r-- | gtk/prefs_dlg.c | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gtk/main.c b/gtk/main.c index 2fccf22dde..fdebf8a4ca 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.255 2002/07/07 22:14:03 guy Exp $ + * $Id: main.c,v 1.256 2002/08/01 03:15:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1213,7 +1213,7 @@ main(int argc, char *argv[]) #endif char *gpf_path, *cf_path, *df_path; - const char *pf_path; + char *pf_path; int gpf_open_errno, pf_open_errno, cf_open_errno, df_open_errno; int err; #ifdef HAVE_LIBPCAP @@ -1953,6 +1953,8 @@ main(int argc, char *argv[]) simple_dialog(ESD_TYPE_WARN, NULL, "Could not open your preferences file\n\"%s\": %s.", pf_path, strerror(pf_open_errno)); + g_free(pf_path); + pf_path = NULL; } /* If the user's capture filter file exists but we failed to open it, @@ -2060,6 +2062,9 @@ main(int argc, char *argv[]) if (prefs_write_needed) { write_prefs(&pf_path); } + } else { + /* Ignore errors silently */ + g_free(pf_path); } epan_cleanup(); diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index fe3773174e..90b9b76067 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -1,7 +1,7 @@ /* prefs_dlg.c * Routines for handling preferences * - * $Id: prefs_dlg.c,v 1.49 2002/07/17 00:22:30 guy Exp $ + * $Id: prefs_dlg.c,v 1.50 2002/08/01 03:15:29 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -914,7 +914,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) gboolean must_redissect = FALSE; int err; char *pf_dir_path; - const char *pf_path; + char *pf_path; /* Fetch the preferences (i.e., make sure all the values set in all of the preferences panes have been copied to "prefs" and the registered @@ -950,6 +950,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) simple_dialog(ESD_TYPE_WARN, NULL, "Can't open preferences file\n\"%s\": %s.", pf_path, strerror(err)); + g_free(pf_path); } } |