summaryrefslogtreecommitdiff
path: root/epan/reassemble.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-09 17:59:34 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-10 02:00:11 +0000
commit8bb1e58cbc7fa283ec016e88982c6dc0887f294e (patch)
tree60c1a6ce779ae4db3ce17b21643e39a6c9253426 /epan/reassemble.c
parentc487d44e5d684837b71bdbd75672249f8c1bb87f (diff)
downloadwireshark-8bb1e58cbc7fa283ec016e88982c6dc0887f294e.tar.gz
Suggest pushing a decision lower in the code.
That leaves less room for getting it wrong. Change-Id: Iea003fc102ccd14db2924b70fc685033ca34f291 Reviewed-on: https://code.wireshark.org/review/13863 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/reassemble.c')
-rw-r--r--epan/reassemble.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c
index 8049b26281..bd785c6ead 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -1219,7 +1219,13 @@ fragment_add_common(reassembly_table *table, tvbuff_t *tvb, const int offset,
gboolean already_added;
- /* dissector shouldn't give us garbage tvb info */
+ /*
+ * Dissector shouldn't give us garbage tvb info.
+ *
+ * XXX - should this code take responsibility for preventing
+ * reassembly if data is missing due to the packets being
+ * sliced, rather than leaving it up to dissectors?
+ */
DISSECTOR_ASSERT(tvb_bytes_exist(tvb, offset, frag_data_len));
fd_head = lookup_fd_head(table, pinfo, id, data, NULL);