diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-01-09 22:18:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-01-10 06:19:37 +0000 |
| commit | 7cd6906056922e4b8f68f1216d94eaa0809896fe (patch) | |
| tree | 5a8c793f188ddda7f36a50369d00ff0de8f563e5 /plugins/wimaxasncp | |
| parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) | |
| download | wireshark-7cd6906056922e4b8f68f1216d94eaa0809896fe.tar.gz | |
Rename tvb_new_subset() to tvb_new_subset_length_caplen().
This emphasizes that there is no such thing as *the* routine to
construct a subset tvbuff; you need to choose one of
tvb_new_subset_remaining() (if you want a new tvbuff that contains
everything past a certain point in an existing tvbuff),
tvb_new_subset_length() (if you want a subset that contains everything
past a certain point, for some number of bytes, in an existing tvbuff),
and tvb_new_subset_length_caplen() (for all other cases).
Many of the calls to tvb_new_subset_length_caplen() should really be
calling one of the other routines; that's the next step. (This also
makes it easier to find the calls that need fixing.)
Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins/wimaxasncp')
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 27d06c81e8..c5c19f391d 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -1887,7 +1887,7 @@ static guint dissect_wimaxasncp_tlvs( tvbuff_t *tlv_tvb; /* N.B. Not padding out tvb length */ - tlv_tvb = tvb_new_subset( + tlv_tvb = tvb_new_subset_length_caplen( tvb, offset, MIN(length, tvb_captured_length_remaining(tvb, offset)), length); @@ -1907,7 +1907,7 @@ static guint dissect_wimaxasncp_tlvs( tvb_ensure_bytes_exist(tvb, offset, length + pad); - tlv_tvb = tvb_new_subset( + tlv_tvb = tvb_new_subset_length_caplen( tvb, offset, MIN(length, tvb_captured_length_remaining(tvb, offset)), length); @@ -2389,7 +2389,7 @@ dissect_wimaxasncp( * ------------------------------------------------------------------------ */ - subtree = tvb_new_subset( + subtree = tvb_new_subset_length_caplen( tvb, offset, MIN(length, tvb_captured_length_remaining(tvb, offset)), length - WIMAXASNCP_HEADER_LENGTH_END); |