summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2009-07-23 05:48:39 +0000
committerAnders Broman <anders.broman@ericsson.com>2009-07-23 05:48:39 +0000
commitded297677f07b1f80b20fb8a44d39e46845db01c (patch)
tree62dbbcbdf406866a7a96495dadd9b91fa6cf19f8 /tshark.c
parent1e7878b53d433cbb5390cea41656d9c199494164 (diff)
downloadwireshark-ded297677f07b1f80b20fb8a44d39e46845db01c.tar.gz
From Kovarththanan Rajaratnam:
Precompile custom columns filters. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3767 svn path=/trunk/; revision=29174
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tshark.c b/tshark.c
index 52aa40f054..10bdf3518a 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1420,8 +1420,15 @@ main(int argc, char *argv[])
cfile.cinfo.col_title[i] = g_strdup(get_column_title(i));
if (cfile.cinfo.col_fmt[i] == COL_CUSTOM) {
cfile.cinfo.col_custom_field[i] = g_strdup(get_column_custom_field(i));
+ if(!dfilter_compile(cfile.cinfo.col_custom_field[i], &cfile.cinfo.col_custom_dfilter[i])) {
+ /* XXX: Should we issue a warning? */
+ g_free(cfile.cinfo.col_custom_field[i]);
+ cfile.cinfo.col_custom_field[i] = NULL;
+ cfile.cinfo.col_custom_dfilter[i] = NULL;
+ }
} else {
cfile.cinfo.col_custom_field[i] = NULL;
+ cfile.cinfo.col_custom_dfilter[i] = NULL;
}
cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) *
NUM_COL_FMTS);