From 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 17 Jun 2014 17:45:00 +0200 Subject: Fixup: tvb_* -> tvb_captured Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman --- epan/dissectors/packet-per.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-per.c') diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 2a343dc02c..2fcb56d427 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -164,7 +164,7 @@ static tvbuff_t *new_octet_aligned_subset(tvbuff_t *tvb, guint32 offset, asn1_ct /* XXX - why are we doing this? Shouldn't we throw an exception if we've * been asked to decode more octets than exist? */ - actual_length = tvb_length_remaining(tvb,boffset); + actual_length = tvb_captured_length_remaining(tvb,boffset); if (length <= actual_length) actual_length = length; @@ -991,7 +991,7 @@ dissect_per_any_oid_str(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_t offset = dissect_per_any_oid(tvb, offset, actx, tree, hf_index, (value_stringx) ? &value_tvb : NULL, is_absolute); if (value_stringx) { - if (value_tvb && (length = tvb_length(value_tvb))) { + if (value_tvb && (length = tvb_captured_length(value_tvb))) { *value_stringx = oid_encoded2string(tvb_get_ptr(value_tvb, 0, length), length); } else { *value_stringx = ""; -- cgit v1.2.3