aboutsummaryrefslogtreecommitdiffstats
path: root/epan/column-info.h
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-12-20 19:59:56 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2015-12-21 13:36:27 +0000
commitdc06d7f0f288a48621715fbd6cd61b02b17745f3 (patch)
tree9cf952ef8736282ca0233aa0588445e058c406fb /epan/column-info.h
parent24d3af8a1aa823758576487eede2654099592380 (diff)
ui: Improved splitting custom column multi-field
Improved the custom column prime regex so that all fields must be separated by "||" or "or" to avoid false positives when having multi-fields which is valid display filters but not valid for custom columns (e.g. "udp and tcp"). Change-Id: Iec9942d458d6b265d04e14b5966907f1de43b782 Reviewed-on: https://code.wireshark.org/review/12751 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/column-info.h')
-rw-r--r--epan/column-info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/column-info.h b/epan/column-info.h
index 45533ab72a..cca684e83a 100644
--- a/epan/column-info.h
+++ b/epan/column-info.h
@@ -36,7 +36,7 @@ extern "C" {
#define COL_MAX_LEN 256
#define COL_MAX_INFO_LEN 4096
-#define COL_CUSTOM_PRIME_REGEX " *([^ \\|]+) *(?:(?:\\|\\|)|(?:or))? *"
+#define COL_CUSTOM_PRIME_REGEX " *([^ \\|]+) *(?:(?:\\|\\|)|(?:or)| *$){1}"
/** Column expression */
typedef struct {