Changeset ff12906

Timestamp:

09/23/15 13:46:38 (5 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

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

Children:

389dd77

Parents:

80e834f

Message:

Fix segfaults when destroying a non-parallel trace

File:

• lib/trace.c (modified) (2 diffs)

lib/trace.c

@@ -270 +270 @@
         libtrace->global_blob = NULL;
         libtrace->hasher = NULL;
+        libtrace->hasher_data = NULL;
         libtrace_zero_ocache(&libtrace->packet_freelist);
         libtrace_zero_thread(&libtrace->hasher_thread);
@@ -900 +901 @@
                          * may have allocated it and zeroing all data associated with it.
                          */
-                        trace_fin_packet(packet);
+                        if (packet->trace == libtrace)
+                                trace_fin_packet(packet);
                         /* Store the trace we are reading from into the packet opaque 
                          * structure */