diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-06-22 20:15:34 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-06-22 20:15:34 +0000 |
| commit | d201977d9c29e3921973542b7c59d2142d1bdcc1 (patch) | |
| tree | d71863ae5bcb4dd44e4be54cbe957b083a1eae4b /epan | |
| parent | f11f450bf0dd462810cfc9842150f88f4352cb55 (diff) | |
Don't assert on invalid custom columns, just set as invalid/unknown.
This fixes bug 6028.
svn path=/trunk/; revision=37756
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 17ee2ad18e..ddd2ffa7c2 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -248,8 +248,7 @@ 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]); - g_assert(hfinfo); - cinfo->col_custom_field_id[i] = hfinfo->id; + cinfo->col_custom_field_id[i] = hfinfo ? hfinfo->id : -1; } } } |