From 7cd6906056922e4b8f68f1216d94eaa0809896fe Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 9 Jan 2017 22:18:49 -0800 Subject: 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 --- epan/dissectors/packet-ldap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-ldap.c') diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 17b54f4b22..71519c66b3 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -3919,7 +3919,7 @@ one_more_pdu: */ length = length_remaining; if (length > msg_len) length = msg_len; - msg_tvb = tvb_new_subset(tvb, offset, length, msg_len); + msg_tvb = tvb_new_subset_length_caplen(tvb, offset, length, msg_len); /* * Now dissect the LDAP message. @@ -4108,7 +4108,7 @@ static void */ length = length_remaining; if (length > sasl_msg_len) length = sasl_msg_len; - sasl_tvb = tvb_new_subset(tvb, offset, length, sasl_msg_len); + sasl_tvb = tvb_new_subset_length_caplen(tvb, offset, length, sasl_msg_len); proto_tree_add_uint(ldap_tree, hf_ldap_sasl_buffer_length, sasl_tvb, 0, 4, sasl_len); @@ -4134,7 +4134,7 @@ static void tmp_length = tvb_reported_length_remaining(sasl_tvb, 4); if ((guint)tmp_length > sasl_len) tmp_length = sasl_len; - gssapi_tvb = tvb_new_subset(sasl_tvb, 4, tmp_length, sasl_len); + gssapi_tvb = tvb_new_subset_length_caplen(sasl_tvb, 4, tmp_length, sasl_len); /* Attempt decryption of the GSSAPI wrapped data if possible */ gssapi_encrypt.gssapi_data_encrypted = FALSE; -- cgit v1.2.3