Changeset 7d1ada1

Timestamp:

02/23/16 16:03:43 (5 years ago)

Author:

Perry Lorier <git@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

a1935fa

Parents:

9636216

Message:

Fix memory management of trace_construct_packet.

File:

• lib/trace.c (modified) (1 diff)

lib/trace.c

@@ -1781 +1781 @@
 
         /* Now fill in the libtrace packet itself */
+        assert(deadtrace);
         packet->trace=deadtrace;
         size=len+sizeof(hdr);
+        if (size < LIBTRACE_PACKET_BUFSIZE)
+            size = LIBTRACE_PACKET_BUFSIZE;
         if (packet->buf_control==TRACE_CTRL_PACKET) {
-                packet->buffer=realloc(packet->buffer,size);
+            packet->buffer = realloc(packet->buffer, size);
         }
         else {
-                packet->buffer=malloc(size);
+                packet->buffer = malloc(size);
         }
         packet->buf_control=TRACE_CTRL_PACKET;
         packet->header=packet->buffer;
         packet->payload=(void*)((char*)packet->buffer+sizeof(hdr));
-        
-        /* Ugh, memcpy - sadly necessary */
-        memcpy(packet->header,&hdr,sizeof(hdr));
-        memcpy(packet->payload,data,(size_t)len);
+
+        /* Ugh, memmove - sadly necessary, also beware that we might be
+         * moving data around within this packet, so ordering is important.
+         */
+        memmove(packet->payload, data, (size_t)len);
+        memmove(packet->header, &hdr, sizeof(hdr));
         packet->type=pcap_linktype_to_rt(libtrace_to_pcap_linktype(linktype));