diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2018-09-05 14:20:14 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2018-09-05 13:43:19 +0000 |
| commit | 28f956ca28b2009679bd200a27cad70e4c57a50a (patch) | |
| tree | dde9ae5b7d43a6263980351df9b9f2e6d5197980 | |
| parent | 94d56a80021b3511354992ae876fe82c07528d01 (diff) | |
| download | wireshark-28f956ca28b2009679bd200a27cad70e4c57a50a.tar.gz wireshark-28f956ca28b2009679bd200a27cad70e4c57a50a.tar.bz2 wireshark-28f956ca28b2009679bd200a27cad70e4c57a50a.zip | |
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>
(cherry picked from commit f3a1c2e76a33855d8fdd71958e5be8d764ac4a68)
Reviewed-on: https://code.wireshark.org/review/29429
| -rw-r--r-- | epan/proto.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/proto.c b/epan/proto.c index 37e5e5189b..a363b85a4e 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5617,7 +5617,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; @@ -5647,6 +5647,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); |