diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-02-03 18:28:46 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-04 04:57:30 +0000 |
| commit | 8899e006aab3e0831214d187596eef450b5e21b7 (patch) | |
| tree | 83b3aebc1c31dcdbd89cb229202b186e6fc57356 /ui/gtk/main.c | |
| parent | 36cf75efb15827c801c4e82c8ab3ed16f3e00749 (diff) | |
Fix memleaks related to get_dirname
get_dirname may return NULL instead of the original string, so avoid
patterns like get_dirname(strdup(x)). Writing to
cf_path.toUtf8().data() is fine btw, toUtf8() returns new memory.
This fixes two memleak reported by LeakSanitizer via fileset_add_dir and
MainWindow::captureFileReadFinished (both via cf_callback_invoke).
Change-Id: I0f1528763e77e1f55b54b6674c890a9d02302ee8
Reviewed-on: https://code.wireshark.org/review/13691
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index b5294bafa4..5ceaf00255 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1452,8 +1452,8 @@ main_cf_cb_file_read_finished(capture_file *cf) add_menu_recent_capture_file(cf->filename); /* Remember folder for next Open dialog and save it in recent */ - dir_path = get_dirname(g_strdup(cf->filename)); - set_last_open_dir(dir_path); + dir_path = g_strdup(cf->filename); + set_last_open_dir(get_dirname(dir_path)); g_free(dir_path); } @@ -1474,8 +1474,8 @@ main_cf_cb_file_rescan_finished(capture_file *cf) add_menu_recent_capture_file(cf->filename); /* Remember folder for next Open dialog and save it in recent */ - dir_path = get_dirname(g_strdup(cf->filename)); - set_last_open_dir(dir_path); + dir_path = g_strdup(cf->filename); + set_last_open_dir(get_dirname(dir_path)); g_free(dir_path); } @@ -3299,8 +3299,8 @@ main(int argc, char *argv[]) if (global_capture_opts.save_file != NULL) { /* Save the directory name for future file dialogs. */ /* (get_dirname overwrites filename) */ - s = get_dirname(g_strdup(global_capture_opts.save_file)); - set_last_open_dir(s); + s = g_strdup(global_capture_opts.save_file); + set_last_open_dir(get_dirname(s)); g_free(s); } /* "-k" was specified; start a capture. */ |