aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Thacker <johnthacker@gmail.com>2024-02-27 20:25:05 -0500
committerJohn Thacker <johnthacker@gmail.com>2024-02-27 20:25:05 -0500
commit7dc0f853c6eed609f13fb2786c3cfa833dc850b5 (patch)
tree3efc2503f0b8cfdb14f5c9e2ca8e95b2bf303426
parent7583014fb06a228aaa78b0e73393ed9175fcaf16 (diff)
prefs: Fix null defererences, remove obsolete functionHEADmaster
Null dereference check to fix Coverity CIDs 1399640 and 1399641. Remove a function that has been unused for a decade.
-rw-r--r--epan/prefs.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 1d0b35c9d3..e0c99bd761 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1752,7 +1752,11 @@ range_t* prefs_get_range_value_real(pref_t *pref, pref_source_t source)
range_t* prefs_get_range_value(const char *module_name, const char* pref_name)
{
- return prefs_get_range_value_real(prefs_find_preference(prefs_find_module(module_name), pref_name), pref_current);
+ pref_t *pref = prefs_find_preference(prefs_find_module(module_name), pref_name);
+ if (pref == NULL) {
+ return NULL;
+ }
+ return prefs_get_range_value_real(pref, pref_current);
}
void
@@ -2369,17 +2373,6 @@ pref_clean_stash(pref_t *pref, gpointer unused _U_)
return 0;
}
-#if 0
-/* Return the value assigned to the given uint preference. */
-guint
-prefs_get_uint_preference(pref_t *pref)
-{
- if (pref && pref->type == PREF_UINT)
- return *pref->varp.uint;
- return 0;
-}
-#endif
-
/*
* Call a callback function, with a specified argument, for each preference
* in a given module.
@@ -5068,7 +5061,11 @@ guint prefs_get_uint_value_real(pref_t *pref, pref_source_t source)
guint prefs_get_uint_value(const char *module_name, const char* pref_name)
{
- return prefs_get_uint_value_real(prefs_find_preference(prefs_find_module(module_name), pref_name), pref_current);
+ pref_t *pref = prefs_find_preference(prefs_find_module(module_name), pref_name);
+ if (pref == NULL) {
+ return 0;
+ }
+ return prefs_get_uint_value_real(pref, pref_current);
}
char* prefs_get_password_value(pref_t *pref, pref_source_t source)