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 /epan/dissectors/packet-rpc.c | |
| parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) | |
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 'epan/dissectors/packet-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index db73e08f57..6c8f7359c3 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -779,7 +779,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, if (dissect_it) { tvbuff_t *opaque_tvb; - opaque_tvb = tvb_new_subset(tvb, data_offset, string_length_copy, + opaque_tvb = tvb_new_subset_length_caplen(tvb, data_offset, string_length_copy, string_length); return (*dissect_it)(opaque_tvb, offset, pinfo, tree, NULL); @@ -1362,7 +1362,7 @@ dissect_rpc_authgss_token(tvbuff_t* tvb, proto_tree* tree, int offset, length = opaque_length; if ((guint32)reported_length > opaque_length) reported_length = opaque_length; - new_tvb = tvb_new_subset(tvb, offset, length, reported_length); + new_tvb = tvb_new_subset_length_caplen(tvb, offset, length, reported_length); len_consumed = call_dissector(gssapi_handle, new_tvb, pinfo, gtree); offset += len_consumed; } @@ -3359,7 +3359,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo, tvb_len = len; if (tvb_reported_len > (gint)len) tvb_reported_len = len; - frag_tvb = tvb_new_subset(tvb, offset, tvb_len, + frag_tvb = tvb_new_subset_length_caplen(tvb, offset, tvb_len, tvb_reported_len); /* |