diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-23 10:55:22 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-23 17:56:11 +0000 |
commit | eb321f87107c9b25a5094d749b3bd9d1a72e1560 (patch) | |
tree | 25fc90238481792b3e005b51f893dd8f0ad7fd0f /epan | |
parent | 17ac3831d6b461e75cb0ddbaf485353891470185 (diff) |
Remove deprecated tvb_length from PIDL dissectors
Also regenerate all to pick up the usage of https in some comment links.
Change-Id: Ic17b6368d2118627178b0b560031450d98e5b5e5
Reviewed-on: https://code.wireshark.org/review/9060
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan')
30 files changed, 40 insertions, 40 deletions
diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index 9bdda4543f..4a7e598560 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-atsvc.h b/epan/dissectors/packet-dcerpc-atsvc.h index c74b9ce405..71fd13e6ff 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.h +++ b/epan/dissectors/packet-dcerpc-atsvc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_ATSVC_H diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index a237a3a788..cb43fa6087 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-dfs.h b/epan/dissectors/packet-dcerpc-dfs.h index a1083481c3..9d9261ac87 100644 --- a/epan/dissectors/packet-dcerpc-dfs.h +++ b/epan/dissectors/packet-dcerpc-dfs.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_NETDFS_H diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index 576db7e8d1..0ae12bbc48 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ @@ -594,7 +594,7 @@ dnsserver_dissect_struct_DNS_RPC_NAME(tvbuff_t *tvb _U_, int offset _U_, packet_ tree = proto_item_add_subtree(item, ett_dnsserver_DNS_RPC_NAME); } offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_dnsserver_DNS_RPC_NAME_NameLength, &len); - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); dn = get_unicode_or_ascii_string(tvb, &offset, TRUE, &dn_len, TRUE, TRUE, &bc); if (dn) { diff --git a/epan/dissectors/packet-dcerpc-dnsserver.h b/epan/dissectors/packet-dcerpc-dnsserver.h index e3e9fb1865..33ba20f250 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.h +++ b/epan/dissectors/packet-dcerpc-dnsserver.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_DNSSERVER_H diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index a1c40bf16b..a705757bc6 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-dssetup.h b/epan/dissectors/packet-dcerpc-dssetup.h index cc936e6a37..9606d1228a 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.h +++ b/epan/dissectors/packet-dcerpc-dssetup.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c index 477f84665f..042aa4b7fe 100644 --- a/epan/dissectors/packet-dcerpc-efs.c +++ b/epan/dissectors/packet-dcerpc-efs.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-efs.h b/epan/dissectors/packet-dcerpc-efs.h index c7915bc83c..7338a75c82 100644 --- a/epan/dissectors/packet-dcerpc-efs.h +++ b/epan/dissectors/packet-dcerpc-efs.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_EFS_H diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index bead8119e5..0a4a0a0600 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ @@ -304,7 +304,7 @@ eventlog_dissect_element_ReadEventLogW_data_(tvbuff_t *tvb, int offset, packet_i * NDR encoded at all and there are byte offsets into this buffer * encoded therein. */ - record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_length_remaining(tvb, offset)), len); + record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_captured_length_remaining(tvb, offset)), len); eventlog_dissect_struct_Record(record_tvb, 0, pinfo, tree, di, drep, hf_eventlog_Record, 0); offset+=len; return offset; @@ -329,7 +329,7 @@ eventlog_dissect_element_Record_sid_offset(tvbuff_t *tvb, int offset, packet_inf /* this blob contains an NT SID. * tvb starts at the beginning of the record. */ - sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_length_remaining(tvb, offset)), sid_length); + sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_captured_length_remaining(tvb, offset)), sid_length); dissect_nt_sid(sid_tvb, 0, tree, "SID", NULL, -1); } return offset; diff --git a/epan/dissectors/packet-dcerpc-eventlog.h b/epan/dissectors/packet-dcerpc-eventlog.h index 953aac95b3..b129a6b853 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.h +++ b/epan/dissectors/packet-dcerpc-eventlog.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_EVENTLOG_H diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index e264f770e6..be674a8e4f 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ @@ -707,7 +707,7 @@ static int frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep _U_, int hf_index, guint32 param _U_) { guint32 nb_chunk = 0; - guint32 remaining = tvb_length_remaining(tvb, offset); + guint32 remaining = tvb_reported_length_remaining(tvb, offset); int align_status = di->no_align; if (remaining > 0) { proto_item *item = proto_tree_add_item(tree, hf_index, tvb, offset, -1, TRUE); @@ -715,7 +715,7 @@ frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_i di->no_align = 1; for(nb_chunk = 0; remaining > 0; nb_chunk++) { offset = frsrpc_dissect_struct_CommPktChunk(tvb, offset, pinfo, subtree, di, drep, hf_CommPktChunk, param); - remaining = tvb_length_remaining(tvb, offset); + remaining = tvb_reported_length_remaining(tvb, offset); } di->no_align = align_status; } diff --git a/epan/dissectors/packet-dcerpc-frsrpc.h b/epan/dissectors/packet-dcerpc-frsrpc.h index 84c6aae8de..7e8cd4e9f5 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.h +++ b/epan/dissectors/packet-dcerpc-frsrpc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index 373c645b50..d28704f86f 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-frstrans.h b/epan/dissectors/packet-dcerpc-frstrans.h index fc537fb5a1..1896e9322e 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.h +++ b/epan/dissectors/packet-dcerpc-frstrans.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_FRSTRANS_H diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index 618b994587..222d6195a1 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-initshutdown.h b/epan/dissectors/packet-dcerpc-initshutdown.h index f676348b88..e2adb25be0 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.h +++ b/epan/dissectors/packet-dcerpc-initshutdown.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #include "packet-dcerpc-lsa.h" diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index 3d50c6fa80..b485be5da9 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ @@ -1553,8 +1553,8 @@ lsarpc_dissect_element_lsa_DomainInfoEfs_efs_blob_(tvbuff_t *tvb _U_, int offset offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep, hf_lsarpc_efs_blob_len, &reported_len); len = reported_len; - if (len > tvb_length_remaining(tvb, offset)) { - len = tvb_length_remaining(tvb, offset); + if (len > tvb_captured_length_remaining(tvb, offset)) { + len = tvb_captured_length_remaining(tvb, offset); } next_tvb = tvb_new_subset(tvb, offset, len, reported_len); efsblob_handle = find_dissector("efsblob"); diff --git a/epan/dissectors/packet-dcerpc-lsa.h b/epan/dissectors/packet-dcerpc-lsa.h index 10c14ab5c3..d3f4e35f8d 100644 --- a/epan/dissectors/packet-dcerpc-lsa.h +++ b/epan/dissectors/packet-dcerpc-lsa.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_LSARPC_H diff --git a/epan/dissectors/packet-dcerpc-mdssvc.c b/epan/dissectors/packet-dcerpc-mdssvc.c index 503d6de2ca..b1fc0a68fb 100644 --- a/epan/dissectors/packet-dcerpc-mdssvc.c +++ b/epan/dissectors/packet-dcerpc-mdssvc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-mdssvc.h b/epan/dissectors/packet-dcerpc-mdssvc.h index 0571dc9edb..ef4f6baf03 100644 --- a/epan/dissectors/packet-dcerpc-mdssvc.h +++ b/epan/dissectors/packet-dcerpc-mdssvc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #include "packet-dcerpc-misc.h" diff --git a/epan/dissectors/packet-dcerpc-misc.c b/epan/dissectors/packet-dcerpc-misc.c index 552163424a..72d88e209a 100644 --- a/epan/dissectors/packet-dcerpc-misc.c +++ b/epan/dissectors/packet-dcerpc-misc.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-misc.h b/epan/dissectors/packet-dcerpc-misc.h index f8d227a562..8cac3eed9b 100644 --- a/epan/dissectors/packet-dcerpc-misc.h +++ b/epan/dissectors/packet-dcerpc-misc.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_MISC_H diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 926c9d8c61..2268d76324 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/packet-dcerpc-samr.h b/epan/dissectors/packet-dcerpc-samr.h index 7b6b99c6f4..003f5504bd 100644 --- a/epan/dissectors/packet-dcerpc-samr.h +++ b/epan/dissectors/packet-dcerpc-samr.h @@ -5,7 +5,7 @@ Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ #ifndef __PACKET_DCERPC_SAMR_H diff --git a/epan/dissectors/pidl/dnsserver.cnf b/epan/dissectors/pidl/dnsserver.cnf index 6edf6407df..eb2043900a 100644 --- a/epan/dissectors/pidl/dnsserver.cnf +++ b/epan/dissectors/pidl/dnsserver.cnf @@ -46,7 +46,7 @@ dnsserver_dissect_struct_DNS_RPC_NAME(tvbuff_t *tvb _U_, int offset _U_, packet_ } offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_dnsserver_DNS_RPC_NAME_NameLength, &len); - bc = tvb_length_remaining(tvb, offset); + bc = tvb_captured_length_remaining(tvb, offset); dn = get_unicode_or_ascii_string(tvb, &offset, TRUE, &dn_len, TRUE, TRUE, &bc); if (dn) { diff --git a/epan/dissectors/pidl/eventlog.cnf b/epan/dissectors/pidl/eventlog.cnf index a6733c9f71..9645ed1782 100644 --- a/epan/dissectors/pidl/eventlog.cnf +++ b/epan/dissectors/pidl/eventlog.cnf @@ -67,7 +67,7 @@ eventlog_dissect_element_ReadEventLogW_data_(tvbuff_t *tvb, int offset, packet_i * NDR encoded at all and there are byte offsets into this buffer * encoded therein. */ - record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_length_remaining(tvb, offset)), len); + record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_captured_length_remaining(tvb, offset)), len); eventlog_dissect_struct_Record(record_tvb, 0, pinfo, tree, di, drep, hf_eventlog_Record, 0); offset+=len; @@ -98,7 +98,7 @@ eventlog_dissect_element_Record_sid_offset(tvbuff_t *tvb, int offset, packet_inf /* this blob contains an NT SID. * tvb starts at the beginning of the record. */ - sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_length_remaining(tvb, offset)), sid_length); + sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_captured_length_remaining(tvb, offset)), sid_length); dissect_nt_sid(sid_tvb, 0, tree, "SID", NULL, -1); } diff --git a/epan/dissectors/pidl/frsrpc.cnf b/epan/dissectors/pidl/frsrpc.cnf index 250697897a..135f5b9c08 100644 --- a/epan/dissectors/pidl/frsrpc.cnf +++ b/epan/dissectors/pidl/frsrpc.cnf @@ -97,7 +97,7 @@ static int frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep _U_, int hf_index, guint32 param _U_) { guint32 nb_chunk = 0; - guint32 remaining = tvb_length_remaining(tvb, offset); + guint32 remaining = tvb_reported_length_remaining(tvb, offset); int align_status = di->no_align; if (remaining > 0) { @@ -106,7 +106,7 @@ frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_i di->no_align = 1; for(nb_chunk = 0; remaining > 0; nb_chunk++) { offset = frsrpc_dissect_struct_CommPktChunk(tvb, offset, pinfo, subtree, di, drep, hf_CommPktChunk, param); - remaining = tvb_length_remaining(tvb, offset); + remaining = tvb_reported_length_remaining(tvb, offset); } di->no_align = align_status; } diff --git a/epan/dissectors/pidl/lsa.cnf b/epan/dissectors/pidl/lsa.cnf index cbbb11c3c1..a55eb2bde7 100644 --- a/epan/dissectors/pidl/lsa.cnf +++ b/epan/dissectors/pidl/lsa.cnf @@ -359,8 +359,8 @@ lsarpc_dissect_element_lsa_DomainInfoEfs_efs_blob_(tvbuff_t *tvb _U_, int offset hf_lsarpc_efs_blob_len, &reported_len); len = reported_len; - if (len > tvb_length_remaining(tvb, offset)) { - len = tvb_length_remaining(tvb, offset); + if (len > tvb_captured_length_remaining(tvb, offset)) { + len = tvb_captured_length_remaining(tvb, offset); } next_tvb = tvb_new_subset(tvb, offset, len, reported_len); |