diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-04-02 21:13:02 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-04-02 21:13:02 +0000 |
| commit | ee5c5e93612f6b9b875cfe8736bf738242c3c11f (patch) | |
| tree | 9101994fc9188ddf1c9a2325a6b3f5a603cf25dc /epan/dissectors/packet-enrp.c | |
| parent | 432e914dbd43c3ee354aa1eeff8f2dc750913f0e (diff) | |
Both tvb_length_remaining and tvb_reported_length_remaining can return -1.
#BACKPORT(1.6,1.8 ... manually as other occurrences are in those trunks)
svn path=/trunk/; revision=48710
Diffstat (limited to 'epan/dissectors/packet-enrp.c')
| -rw-r--r-- | epan/dissectors/packet-enrp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index b3c06fd215..82f15d5797 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -232,7 +232,7 @@ dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree) tvbuff_t *error_cause_tvb; offset = 0; - while(tvb_reported_length_remaining(error_causes_tvb, offset)) { + while(tvb_reported_length_remaining(error_causes_tvb, offset) > 0) { length = tvb_get_ntohs(error_causes_tvb, offset + CAUSE_LENGTH_OFFSET); total_length = ADD_PADDING(length); error_cause_tvb = tvb_new_subset(error_causes_tvb, offset , total_length, total_length); @@ -715,7 +715,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree) tvbuff_t *parameter_tvb; offset = 0; - while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) { + while((remaining_length = tvb_length_remaining(parameters_tvb, offset)) > 0) { length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); total_length = ADD_PADDING(length); if (remaining_length >= length) |