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/pidl | |
| 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/pidl')
| -rw-r--r-- | epan/dissectors/pidl/eventlog/eventlog.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/pidl/lsa/lsa.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/pidl/mapi/response.cnf.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/pidl/eventlog/eventlog.cnf b/epan/dissectors/pidl/eventlog/eventlog.cnf index 1e6690b402..f918211715 100644 --- a/epan/dissectors/pidl/eventlog/eventlog.cnf +++ b/epan/dissectors/pidl/eventlog/eventlog.cnf @@ -54,7 +54,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_captured_length_remaining(tvb, offset)), len); + record_tvb=tvb_new_subset_length_caplen(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; @@ -85,7 +85,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_captured_length_remaining(tvb, offset)), sid_length); + sid_tvb=tvb_new_subset_length_caplen(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/lsa/lsa.cnf b/epan/dissectors/pidl/lsa/lsa.cnf index 01c0f56579..738476d4fb 100644 --- a/epan/dissectors/pidl/lsa/lsa.cnf +++ b/epan/dissectors/pidl/lsa/lsa.cnf @@ -383,7 +383,7 @@ lsarpc_dissect_element_lsa_DomainInfoEfs_efs_blob_(tvbuff_t *tvb _U_, int offset len = tvb_captured_length_remaining(tvb, offset); } - next_tvb = tvb_new_subset(tvb, offset, len, reported_len); + next_tvb = tvb_new_subset_length_caplen(tvb, offset, len, reported_len); efsblob_handle = find_dissector("efsblob"); if (efsblob_handle) { diff --git a/epan/dissectors/pidl/mapi/response.cnf.c b/epan/dissectors/pidl/mapi/response.cnf.c index a4f4b7e034..cefa4be7b7 100644 --- a/epan/dissectors/pidl/mapi/response.cnf.c +++ b/epan/dissectors/pidl/mapi/response.cnf.c @@ -172,7 +172,7 @@ mapi_dissect_element_EcDoRpc_response__(tvbuff_t *tvb _U_, int offset _U_, packe tvbuff_t *subtvb; length = tvb_get_letohs(tvb, offset); - subtvb = tvb_new_subset(tvb, offset, length, length); + subtvb = tvb_new_subset_length_caplen(tvb, offset, length, length); offset += 2; while (offset < length) { |