osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Peter Wu 2016-02-03 18:28:46 +01:00 committed by Anders Broman
parent 36cf75efb1
commit 8899e006aa
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fileset.c
View File

@ -275,8 +275,8 @@ fileset_add_dir(const char *fname, void *window)
/* get (convert) directory name, but don't touch the given string */
fname_dup = get_dirname(g_strdup(fname));
dirname = g_string_new(fname_dup);
fname_dup = g_strdup(fname);
dirname = g_string_new(get_dirname(fname_dup));
g_free(fname_dup);
set.dirname = g_strdup(dirname->str);

12
ui/gtk/main.c
View File

@ -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. */

8
ui/qt/main_window.cpp
View File

@ -1323,8 +1323,8 @@ void MainWindow::saveAsCaptureFile(capture_file *cf, bool must_support_comments,
case CF_WRITE_OK:
/* The save succeeded; we're done. */
/* Save the directory name for future file dialogs. */
dirname = get_dirname(qstring_strdup(file_name)); /* Overwrites cf_name */
set_last_open_dir(dirname);
dirname = qstring_strdup(file_name); /* Overwrites cf_name */
set_last_open_dir(get_dirname(dirname));
g_free(dirname);
/* If we discarded comments, redraw the packet list to reflect
any packets that no longer have comments. */
@ -1463,8 +1463,8 @@ void MainWindow::exportSelectedPackets() {
case CF_WRITE_OK:
/* The save succeeded; we're done. */
/* Save the directory name for future file dialogs. */
dirname = get_dirname(qstring_strdup(file_name)); /* Overwrites cf_name */
set_last_open_dir(dirname);
dirname = qstring_strdup(file_name); /* Overwrites cf_name */
set_last_open_dir(get_dirname(dirname));
g_free(dirname);
/* If we discarded comments, redraw the packet list to reflect
any packets that no longer have comments. */

6
ui/qt/main_window_slots.cpp
View File

@ -261,7 +261,7 @@ bool MainWindow::openCaptureFile(QString cf_path, QString read_filter, unsigned
}
break;
}
// get_dirname overwrites its path. Hopefully this isn't a problem.
// get_dirname overwrites its path.
wsApp->setLastOpenDir(get_dirname(cf_path.toUtf8().data()));
main_ui_->statusBar->showExpert();
@ -706,8 +706,8 @@ void MainWindow::captureFileReadFinished() {
add_menu_recent_capture_file(capture_file_.capFile()->filename);
/* Remember folder for next Open dialog and save it in recent */
dir_path = get_dirname(g_strdup(capture_file_.capFile()->filename));
wsApp->setLastOpenDir(dir_path);
dir_path = g_strdup(capture_file_.capFile()->filename);
wsApp->setLastOpenDir(get_dirname(dir_path));
g_free(dir_path);
}

4
wireshark-qt.cpp
View File

@ -1410,8 +1410,8 @@ int main(int argc, char *argv[])
if (global_capture_opts.save_file != NULL) {
/* Save the directory name for future file dialogs. */
/* (get_dirname overwrites filename) */
gchar *s = get_dirname(g_strdup(global_capture_opts.save_file));
set_last_open_dir(s);
gchar *s = g_strdup(global_capture_opts.save_file);
set_last_open_dir(get_dirname(s));
g_free(s);
}
/* "-k" was specified; start a capture. */