aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-09-05 14:20:14 +0200
committerStig Bjørlykke <stig@bjorlykke.org>2018-09-05 13:43:05 +0000
commita1ae40f1a3d8a6ce85a8fa82c7487c523d73ad80 (patch)
treee540add0553587e6cd6cd31930d277c242f18401 /epan/proto.c
parente4b2b4bd36d17dde24a924f672526c5186481ad3 (diff)
proto: Reset handled occurrences counter
Reset handled occurrences counter between each multi field custom column to be able to handle configurations with occurrence set. Change-Id: Iaa01da069b661ddbb2871370fcc9f9fde33041bb Reviewed-on: https://code.wireshark.org/review/29427 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/proto.c b/epan/proto.c
index 6188f653bf..68336de07e 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -5819,7 +5819,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence,
const true_false_string *tfstring;
- int len, prev_len = 0, last, i, offset_r = 0, offset_e = 0;
+ int len, prev_len, last, i, offset_r = 0, offset_e = 0;
GPtrArray *finfos;
field_info *finfo = NULL;
header_field_info* hfinfo;
@@ -5849,6 +5849,8 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence,
}
}
+ prev_len = 0; /* Reset handled occurrences */
+
while (hfinfo) {
finfos = proto_get_finfo_ptr_array(tree, hfinfo->id);