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],
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;
}
field_info *finfo;
header_field_info* hfinfo;
- g_assert(field_id>=0);
+ g_assert(field_id >= 0);
hfinfo = proto_registrar_get_nth((guint)field_id);