QUIC: Update IETF draft URL (draft-08)

[metze/wireshark/wip.git] / epan / tvbuff_composite.c

diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c
index f7cff5c59eb0498a3173c74e576f53b03d1fb2f2..a7b9b7c3472827d746aae3df6004a397cfd7c4b7 100644 (file)
--- a/epan/tvbuff_composite.c
+++ b/epan/tvbuff_composite.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"     /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
@@ -114,7 +112,10 @@ composite_get_ptr(tvbuff_t *tvb, guint abs_offset, guint abs_length)
                return tvb_get_ptr(member_tvb, member_offset, abs_length);
        }
        else {
-               tvb->real_data = (guint8 *)tvb_memdup(NULL, tvb, 0, -1);
+               /* Use a temporary variable as tvb_memcpy is also checking tvb->real_data pointer */
+               void *real_data = g_malloc(tvb->length);
+               tvb_memcpy(tvb, real_data, 0, tvb->length);
+               tvb->real_data = (const guint8 *)real_data;
                return tvb->real_data + abs_offset;
        }
 
@@ -166,7 +167,7 @@ composite_memcpy(tvbuff_t *tvb, void* _target, guint abs_offset, guint abs_lengt
                 * then iterate across the other member tvb's, copying their portions
                 * until we have copied all data.
                 */
-               member_length = tvb_length_remaining(member_tvb, member_offset);
+               member_length = tvb_captured_length_remaining(member_tvb, member_offset);
 
                /* composite_memcpy() can't handle a member_length of zero. */
                DISSECTOR_ASSERT(member_length > 0);
@@ -292,6 +293,23 @@ 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;
+       tvb->ds_tvb = tvb;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */