diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-02-19 23:17:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-02-19 23:17:07 +0000 |
| commit | 29715ccc8f78d9a2f791437f49d6718615795c15 (patch) | |
| tree | 36c72f6cae5e8e8ed09086eef9249eac9a65ca04 /epan/dissectors/packet-c1222.c | |
| parent | 5a5d872639a9e20893f82079af06f4caec980277 (diff) | |
How can I get a new tvbuff that starts at an offset within a given
tvbuff and runs to the end of the tvbuff? Let me count the ways....
Replace a bunch of different ways of doing that (some incorrect, in that
they're not properly handling tvbuffs where the captured and reported
lengths are different) with tvb_new_subset_remaining().
svn path=/trunk/; revision=47751
Diffstat (limited to 'epan/dissectors/packet-c1222.c')
| -rw-r--r-- | epan/dissectors/packet-c1222.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index a8f8b1770d..dcae3794dc 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -952,7 +952,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ if (len2 <= 0) return offset; buffer = (guchar *)tvb_memdup(tvb, offset, len2); - epsem_buffer = tvb_new_subset(tvb, offset, -1, -1); + epsem_buffer = tvb_new_subset_remaining(tvb, offset); if (c1222_decrypt) { if (!decrypt_packet(buffer, len2, FALSE)) { #ifdef HAVE_LIBGCRYPT @@ -968,7 +968,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ break; default: /* it's not encrypted */ - epsem_buffer = tvb_new_subset(tvb, offset, -1, -1); + epsem_buffer = tvb_new_subset_remaining(tvb, offset); } /* it's only encrypted if we have an undecrypted payload */ if (encrypted) { |