diff options
| author | Jim Young <jyoung@gsu.edu> | 2019-12-03 22:53:40 -0500 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-12-06 21:24:41 +0000 |
| commit | 1e3db49f054b2ff893d5a8139d3a2308c5ad3ba0 (patch) | |
| tree | 7b19d3f0167b832ef954dd2a78f78061434e7f73 /ui | |
| parent | 643dc759644a0549bb281b22d5b46c1292c9624a (diff) | |
recent.c: cfield might be NULL
Avoid crash in GUI when using Edit Column widget.
Bug: 16245
Change-Id: Ic98be3f98144dcfa9796fadd142180e3aaf84a9e
Reviewed-on: https://code.wireshark.org/review/35301
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/recent.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/recent.c b/ui/recent.c index 2066a39ed7..ad954d12a9 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -1455,7 +1455,9 @@ recent_get_column_width(gint col) while (col_l) { col_w = (col_width_data *) col_l->data; if (col_w->cfmt == cfmt) { - if (cfmt != COL_CUSTOM || strcmp (cfield, col_w->cfield) == 0) { + if (cfmt != COL_CUSTOM) { + return col_w->width; + } else if (cfield && strcmp (cfield, col_w->cfield) == 0) { return col_w->width; } } @@ -1519,7 +1521,9 @@ recent_get_column_xalign(gint col) while (col_l) { col_w = (col_width_data *) col_l->data; if (col_w->cfmt == cfmt) { - if (cfmt != COL_CUSTOM || strcmp (cfield, col_w->cfield) == 0) { + if (cfmt != COL_CUSTOM) { + return col_w->xalign; + } else if (cfield && strcmp (cfield, col_w->cfield) == 0) { return col_w->xalign; } } |