summaryrefslogtreecommitdiff
path: root/epan/tvbuff_composite.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-09-04 20:04:56 +0200
committerEvan Huus <eapache@gmail.com>2014-09-04 19:31:47 +0000
commit67bff64ad7d0bea5f8cfc26a49fadf4b246c12a0 (patch)
treec9367479e134254f4d0422bf4a23a770f168cff5 /epan/tvbuff_composite.c
parentcccc9275ca242b950284786fdc6f53cc45b70fb8 (diff)
downloadwireshark-67bff64ad7d0bea5f8cfc26a49fadf4b246c12a0.tar.gz
tvbuff composite: fix Dereference of null pointer found by Clang Analyzer
Change-Id: Ia43cb2e1cab99e4b769c8dfa0805d8e38e225a1c Reviewed-on: https://code.wireshark.org/review/3990 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/tvbuff_composite.c')
-rw-r--r--epan/tvbuff_composite.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c
index f7cff5c59e..954e2539f4 100644
--- a/epan/tvbuff_composite.c
+++ b/epan/tvbuff_composite.c
@@ -292,6 +292,9 @@ tvb_composite_finalize(tvbuff_t *tvb)
composite->end_offsets[i] = tvb->length - 1;
i++;
}
+
+ DISSECTOR_ASSERT(composite->tvbs);
+
tvb_add_to_chain((tvbuff_t *)composite->tvbs->data, tvb); /* chain composite tvb to first member */
tvb->initialized = TRUE;
}