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-couchbase.c | |
| 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 'epan/dissectors/packet-couchbase.c')
| -rw-r--r-- | epan/dissectors/packet-couchbase.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index c93ea0f3d6..6fb48bf43f 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -1217,7 +1217,7 @@ dissect_multipath_lookup_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(multipath_tree, hf_value, tvb, offset, result_len, ENC_ASCII | ENC_NA); if (result_len > 0) { - json_tvb = tvb_new_subset(tvb, offset, result_len, result_len); + json_tvb = tvb_new_subset_length_caplen(tvb, offset, result_len, result_len); call_dissector(json_handle, json_tvb, pinfo, multipath_tree); } offset += result_len; @@ -1267,7 +1267,7 @@ dissect_multipath_mutation_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(multipath_tree, hf_value, tvb, offset, result_len, ENC_ASCII | ENC_NA); if (result_len > 0) { - json_tvb = tvb_new_subset(tvb, offset, result_len, result_len); + json_tvb = tvb_new_subset_length_caplen(tvb, offset, result_len, result_len); call_dissector(json_handle, json_tvb, pinfo, multipath_tree); } offset += result_len; @@ -1473,7 +1473,7 @@ dissect_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else if (!request && has_json_value(opcode)) { tvbuff_t *json_tvb; ti = proto_tree_add_item(tree, hf_value, tvb, offset, value_len, ENC_ASCII | ENC_NA); - json_tvb = tvb_new_subset(tvb, offset, value_len, value_len); + json_tvb = tvb_new_subset_length_caplen(tvb, offset, value_len, value_len); call_dissector(json_handle, json_tvb, pinfo, tree); } else if (opcode == PROTOCOL_BINARY_CMD_SUBDOC_MULTI_LOOKUP || @@ -1683,7 +1683,7 @@ dissect_couchbase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat ENC_ASCII | ENC_NA); if (status == PROTOCOL_BINARY_RESPONSE_NOT_MY_VBUCKET) { tvbuff_t *json_tvb; - json_tvb = tvb_new_subset(tvb, offset, bodylen, bodylen); + json_tvb = tvb_new_subset_length_caplen(tvb, offset, bodylen, bodylen); call_dissector(json_handle, json_tvb, pinfo, couchbase_tree); } else if (opcode == PROTOCOL_BINARY_CMD_SUBDOC_MULTI_LOOKUP) { |