diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-12-20 20:09:00 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-20 20:46:21 +0000 |
| commit | b4e90bdc8e5db01a3f38fab97cc1e341288d7c0b (patch) | |
| tree | 80469e3580bed66a14b286ae3a2fc86345d3a4e5 /epan/column-utils.c | |
| parent | 8b24471e62940d8a9335151809d6bc5913f94fdd (diff) | |
| download | wireshark-b4e90bdc8e5db01a3f38fab97cc1e341288d7c0b.tar.gz wireshark-b4e90bdc8e5db01a3f38fab97cc1e341288d7c0b.tar.bz2 wireshark-b4e90bdc8e5db01a3f38fab97cc1e341288d7c0b.zip | |
Fix filter test for multifield custom column
This adds support for "field||field" without spaces.
Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68
Reviewed-on: https://code.wireshark.org/review/5922
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 22c80f95f6..23b94d6e83 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -342,7 +342,7 @@ col_custom_prime_edt(epan_dissect_t *edt, column_info *cinfo) gchar **fields; guint i_field = 0; - fields = g_regex_split_simple(" *([^ ]+) *(?:(?:\\|\\|)|(?:or))? *", + fields = g_regex_split_simple(" *([^ \\|]+) *(?:(?:\\|\\|)|(?:or))? *", cinfo->col_custom_field[i], G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED); for (i_field =0; i_field < g_strv_length(fields); i_field += 1) { |