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

Fix CID 966637 and CID 966638 

Check pointers before using them.

svn path=/trunk/; revision=47186
This commit is contained in:
Jaap Keuter 2013-01-20 21:14:12 +00:00
parent 6e8c33d01c
commit 5fe15dfd37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/prefs.c
View File

@ -1338,7 +1338,7 @@ static char * column_hidden_to_str_cb(pref_t* pref, gboolean default_val) {
return g_strdup(pref->default_val.string);
format_pref = prefs_find_preference(gui_column_module, PRS_COL_FMT);
clp = *format_pref->varp.list;
clp = (format_pref) ? *format_pref->varp.list : NULL;
while (clp) {
gchar *prefs_fmt;
cfmt = (fmt_data *) clp->data;
@ -1551,7 +1551,7 @@ static gboolean column_format_is_default_cb(pref_t* pref) {
/* See if the column data has changed from the default */
col_num_pref = prefs_find_preference(gui_column_module, PRS_COL_NUM);
if (*col_num_pref->varp.uint != col_num_pref->default_val.uint) {
if (col_num_pref && *col_num_pref->varp.uint != col_num_pref->default_val.uint) {
is_default = FALSE;
} else {
while (pref_col && def_col) {