aboutsummaryrefslogtreecommitdiffstats
path: root/epan/oids.c
diff options
context:
space:
mode:
authorrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>2010-03-17 13:26:07 +0000
committerrbalint <rbalint@f5534014-38df-0310-8fa8-9805f1628bb7>2010-03-17 13:26:07 +0000
commit2507e8ad515292cf3bff68e2583fb24895d485ab (patch)
tree7018a62642cf0f0678844748595e339ee76510be /epan/oids.c
parentf72b621136a1e883e019dff7f5c304501909576c (diff)
Fix crash when opening About box with disabled OID resolution.
Thanks to Hilko Bengen for the detailed bug report at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574086 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32217 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/oids.c')
-rw-r--r--epan/oids.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/oids.c b/epan/oids.c
index d9a5b53022..8028a69e43 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -1123,6 +1123,11 @@ oid_get_default_mib_path(void) {
guint i;
path_str = g_string_new("");
+
+ if (!prefs.load_smi_modules) {
+ D(1,("OID resolution not enabled"));
+ return path_str->str;
+ }
#ifdef _WIN32
#define PATH_SEPARATOR ";"
path = get_datafile_path("snmp\\mibs");