diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-10-08 16:35:58 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-10-08 16:35:58 +0000 |
| commit | e981de7a99a38dec9ab5befb08437086b38649d2 (patch) | |
| tree | 43b7fd9a4c01de104737bc002d0602e4c5d67b29 /epan/column-utils.c | |
| parent | 6645d6e47dfc0c1a81cda67dcf0b094b7839605c (diff) | |
Don't attempt to fill custom columns if we don't have a valid column expression.
svn path=/trunk/; revision=30407
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index f18e4dc42e..a3b93902fc 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -217,9 +217,10 @@ void col_custom_set_edt(epan_dissect_t *edt, column_info *cinfo) for (i = cinfo->col_first[COL_CUSTOM]; i <= cinfo->col_last[COL_CUSTOM]; i++) { - if (cinfo->fmt_matx[i][COL_CUSTOM] && cinfo->col_custom_field[i]) { - cinfo->col_data[i] = cinfo->col_buf[i]; - + if (cinfo->fmt_matx[i][COL_CUSTOM] && + cinfo->col_custom_field[i] && + cinfo->col_custom_field_id[i] != -1) { + cinfo->col_data[i] = cinfo->col_buf[i]; cinfo->col_expr.col_expr[i] = epan_custom_set(edt, cinfo->col_custom_field_id[i], cinfo->col_buf[i], cinfo->col_expr.col_expr_val[i], @@ -245,7 +246,6 @@ col_custom_prime_edt(epan_dissect_t *edt, column_info *cinfo) epan_dissect_prime_dfilter(edt, cinfo->col_custom_dfilter[i]); if (cinfo->col_custom_field) { header_field_info* hfinfo = proto_registrar_get_byname(cinfo->col_custom_field[i]); - /* ASSERT if none ? */ g_assert(hfinfo); cinfo->col_custom_field_id[i] = hfinfo->id; } |