diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-03-19 22:46:49 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-24 07:07:14 +0000 |
| commit | 2f34f262038de32c4a39cf11a164551cd0633773 (patch) | |
| tree | ad0a37e7431bc07651b77782940add123081b51e /ui/qt/about_dialog.cpp | |
| parent | 98b46985dd5903db2b89219b1eb480620f342d17 (diff) | |
OID name resolv: Fix MIB/PIB path presentations
oids.c: Sort out libsmi init, add user paths once.
Qt, About WS: Stop memory leak of MIB/PIB paths.
GTK, About WS: Allow for 20 individual paths.
tshark, folders: init before getting paths, allow 20 individual.
Bug: 14539
Change-Id: I113ee2dd4394d553a16b256e66fd840eeeec78ef
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26555
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/about_dialog.cpp')
| -rw-r--r-- | ui/qt/about_dialog.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 23064cce27..695b7c643d 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -255,7 +255,9 @@ FolderListModel::FolderListModel(QObject * parent): #ifdef HAVE_LIBSMI /* SMI MIBs/PIBs */ - QStringList smiPaths = QString(oid_get_default_mib_path()).split(G_SEARCHPATH_SEPARATOR_S); + char *default_mib_path = oid_get_default_mib_path(); + QStringList smiPaths = QString(default_mib_path).split(G_SEARCHPATH_SEPARATOR_S); + g_free(default_mib_path); foreach(QString path, smiPaths) appendRow( QStringList() << tr("MIB/PIB path") << path.trimmed() << tr("SMI MIB/PIB search path")); #endif |