Changeset 8370482

Timestamp:

03/31/15 11:35:06 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

bf3c54e

Parents:

dfbdda7a

Message:

Fix bug when not using reporter combiner is destroyed without be initialised

File:

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

lib/trace.c

@@ -704 +704 @@
                 // This has all of our packets
                 libtrace_ocache_destroy(&libtrace->packet_freelist);
-                if (libtrace->combiner.destroy)
+                if (libtrace->combiner.destroy && libtrace->reporter)
                         libtrace->combiner.destroy(libtrace, &libtrace->combiner);
                 free(libtrace->perpkt_threads);